Skip to content

Commit 82cf3b8

Browse files
bebarinobebarino
committed
Merge tag 'qcom-clk-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-qcom
Pull Qualcomm clk driver updates from Bjorn Andersson: - Add camera, display and GPU clock drivers for Qualcomm SM4450 - Add a camera clock driver for Qualcomm SM8150 - Mark a bunch of struct freq_tbl const to reduce .data usage - Add Qualcomm MSM8226 A7PLL and Regera PLL support - Fix the Qualcomm Lucid 5LPE PLL configuration sequence to not reuse Trion, as they do differ - A number of fixes to the Qualcomm SM8550 display clock driver - Fold Qualcomm SM8650 display clock driver into SM8550 one - Add missing clocks and GDSCs needed for audio on Qualcomm MSM8998 - Add missing USB MP resets, GPLL9, and QUPv3 DFS to Qualcomm SC8180X - Fix sdcc clk frequency tables on Qualcomm SC8180X - Drop the Qualcomm SM8150 gcc_cpuss_ahb_clk_src - Mark Qualcomm PCIe GDSCs as RET_ON on sm8250 and sm8540 to avoid them turning off during suspend - Use the HW_CTRL mechanism on Qualcomm SM8550 video clock controller GDSCs * tag 'qcom-clk-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: (47 commits) clk: qcom: videocc-sm8550: Use HW_CTRL_TRIGGER flag for video GDSC's clk: qcom: dispcc-sm8250: use special function for Lucid 5LPE PLL clk: qcom: dispcc-sm8250: use CLK_SET_RATE_PARENT for branch clocks clk: qcom: ipq5332: Use icc-clk for enabling NoC related clocks clk: qcom: ipq5332: Register gcc_qdss_tsctr_clk_src dt-bindings: usb: qcom,dwc3: Update ipq5332 clock details dt-bindings: interconnect: Add Qualcomm IPQ5332 support clk: qcom: gcc-msm8998: Add Q6 BIMC and LPASS core, ADSP SMMU clocks dt-bindings: clock: gcc-msm8998: Add Q6 and LPASS clocks definitions clk: qcom: Fix SM_CAMCC_8150 dependencies clk: qcom: gcc-sm8150: De-register gcc_cpuss_ahb_clk_src clk: qcom: gcc-sc8180x: Fix the sdcc2 and sdcc4 clocks freq table clk: qcom: gcc-sc8180x: Add GPLL9 support dt-bindings: clock: qcom: Add GPLL9 support on gcc-sc8180x clk: qcom: gcc-sc8180x: Register QUPv3 RCGs for DFS on sc8180x clk: qcom: clk-rpmh: Fix overflow in BCM vote dt-bindings: clock: qcom: Drop required-opps in required on SM8650 camcc dt-bindings: clock: qcom: Drop required-opps in required on sm8650 videocc dt-bindings: clock: qcom,qcs404-turingcc: convert to dtschema dt-bindings: clock: Add x1e80100 LPASSCC reset controller ...
2 parents 8400291 + d628455 commit 82cf3b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6843
-2380
lines changed

‎Documentation/devicetree/bindings/clock/qcom,a53pll.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- qcom,ipq6018-a53pll
2222
- qcom,ipq8074-a53pll
2323
- qcom,ipq9574-a73pll
24+
- qcom,msm8226-a7pll
2425
- qcom,msm8916-a53pll
2526
- qcom,msm8939-a53pll
2627

@@ -40,6 +41,9 @@ properties:
4041

4142
operating-points-v2: true
4243

44+
opp-table:
45+
type: object
46+
4347
required:
4448
- compatible
4549
- reg

‎Documentation/devicetree/bindings/clock/qcom,ipq5332-gcc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ properties:
3131
- description: USB PCIE wrapper pipe clock source
3232

3333
'#power-domain-cells': false
34+
'#interconnect-cells':
35+
const: 1
3436

3537
required:
3638
- compatible

‎Documentation/devicetree/bindings/clock/qcom,qcs404-turingcc.yaml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,qcs404-turingcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Turing Clock & Reset Controller on QCS404
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: qcom,qcs404-turingcc
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
'#clock-cells':
23+
const: 1
24+
25+
'#reset-cells':
26+
const: 1
27+
28+
required:
29+
- compatible
30+
- reg
31+
- clocks
32+
- '#clock-cells'
33+
- '#reset-cells'
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/qcom,gcc-qcs404.h>
40+
clock-controller@800000 {
41+
compatible = "qcom,qcs404-turingcc";
42+
reg = <0x00800000 0x30000>;
43+
clocks = <&gcc GCC_CDSP_CFG_AHB_CLK>;
44+
45+
#clock-cells = <1>;
46+
#reset-cells = <1>;
47+
};

‎Documentation/devicetree/bindings/clock/qcom,sc8280xp-lpasscc.yaml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,16 @@ description: |
1818
1919
properties:
2020
compatible:
21-
enum:
22-
- qcom,sc8280xp-lpassaudiocc
23-
- qcom,sc8280xp-lpasscc
21+
oneOf:
22+
- enum:
23+
- qcom,sc8280xp-lpassaudiocc
24+
- qcom,sc8280xp-lpasscc
25+
- items:
26+
- const: qcom,x1e80100-lpassaudiocc
27+
- const: qcom,sc8280xp-lpassaudiocc
28+
- items:
29+
- const: qcom,x1e80100-lpasscc
30+
- const: qcom,sc8280xp-lpasscc
2431

2532
reg:
2633
maxItems: 1

‎Documentation/devicetree/bindings/clock/qcom,sm4450-camcc.yaml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,sm4450-camcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller on SM4450
8+
9+
maintainers:
10+
- Ajit Pandey <[email protected]>
11+
- Taniya Das <[email protected]>
12+
13+
description: |
14+
Qualcomm camera clock control module provides the clocks, resets and power
15+
domains on SM4450
16+
17+
See also:: include/dt-bindings/clock/qcom,sm4450-camcc.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,sm4450-camcc
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
items:
28+
- description: Board XO source
29+
- description: Camera AHB clock source from GCC
30+
31+
'#clock-cells':
32+
const: 1
33+
34+
'#reset-cells':
35+
const: 1
36+
37+
'#power-domain-cells':
38+
const: 1
39+
40+
required:
41+
- compatible
42+
- reg
43+
- clocks
44+
- '#clock-cells'
45+
- '#reset-cells'
46+
- '#power-domain-cells'
47+
48+
additionalProperties: false
49+
50+
examples:
51+
- |
52+
#include <dt-bindings/clock/qcom,rpmh.h>
53+
#include <dt-bindings/clock/qcom,sm4450-gcc.h>
54+
clock-controller@ade0000 {
55+
compatible = "qcom,sm4450-camcc";
56+
reg = <0x0ade0000 0x20000>;
57+
clocks = <&rpmhcc RPMH_CXO_CLK>,
58+
<&gcc GCC_CAMERA_AHB_CLK>;
59+
#clock-cells = <1>;
60+
#reset-cells = <1>;
61+
#power-domain-cells = <1>;
62+
};
63+
...

‎Documentation/devicetree/bindings/clock/qcom,sm4450-dispcc.yaml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,sm4450-dispcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Display Clock & Reset Controller on SM4450
8+
9+
maintainers:
10+
- Ajit Pandey <[email protected]>
11+
- Taniya Das <[email protected]>
12+
13+
description: |
14+
Qualcomm display clock control module provides the clocks, resets and power
15+
domains on SM4450
16+
17+
See also:: include/dt-bindings/clock/qcom,sm4450-dispcc.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,sm4450-dispcc
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
items:
28+
- description: Board XO source
29+
- description: Board active XO source
30+
- description: Display AHB clock source from GCC
31+
- description: sleep clock source
32+
- description: Byte clock from DSI PHY0
33+
- description: Pixel clock from DSI PHY0
34+
35+
'#clock-cells':
36+
const: 1
37+
38+
'#reset-cells':
39+
const: 1
40+
41+
'#power-domain-cells':
42+
const: 1
43+
44+
required:
45+
- compatible
46+
- reg
47+
- clocks
48+
- '#clock-cells'
49+
- '#reset-cells'
50+
- '#power-domain-cells'
51+
52+
additionalProperties: false
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/clock/qcom,rpmh.h>
57+
#include <dt-bindings/clock/qcom,sm4450-gcc.h>
58+
clock-controller@af00000 {
59+
compatible = "qcom,sm4450-dispcc";
60+
reg = <0x0af00000 0x20000>;
61+
clocks = <&rpmhcc RPMH_CXO_CLK>,
62+
<&rpmhcc RPMH_CXO_CLK_A>,
63+
<&gcc GCC_DISP_AHB_CLK>,
64+
<&sleep_clk>,
65+
<&dsi0_phy_pll_out_byteclk>,
66+
<&dsi0_phy_pll_out_dsiclk>;
67+
#clock-cells = <1>;
68+
#reset-cells = <1>;
69+
#power-domain-cells = <1>;
70+
};
71+
...

‎Documentation/devicetree/bindings/clock/qcom,sm8150-camcc.yaml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,sm8150-camcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller on SM8150
8+
9+
maintainers:
10+
- Satya Priya Kakitapalli <[email protected]>
11+
12+
description: |
13+
Qualcomm camera clock control module provides the clocks, resets and
14+
power domains on SM8150.
15+
16+
See also:: include/dt-bindings/clock/qcom,sm8150-camcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,sm8150-camcc
21+
22+
reg:
23+
maxItems: 1
24+
25+
clocks:
26+
items:
27+
- description: Board XO source
28+
- description: Camera AHB clock from GCC
29+
30+
power-domains:
31+
maxItems: 1
32+
description:
33+
A phandle and PM domain specifier for the MMCX power domain.
34+
35+
required-opps:
36+
maxItems: 1
37+
description:
38+
A phandle to an OPP node describing required MMCX performance point.
39+
40+
'#clock-cells':
41+
const: 1
42+
43+
'#reset-cells':
44+
const: 1
45+
46+
'#power-domain-cells':
47+
const: 1
48+
49+
required:
50+
- compatible
51+
- reg
52+
- clocks
53+
- power-domains
54+
- required-opps
55+
- '#clock-cells'
56+
- '#reset-cells'
57+
- '#power-domain-cells'
58+
59+
additionalProperties: false
60+
61+
examples:
62+
- |
63+
#include <dt-bindings/clock/qcom,gcc-sm8150.h>
64+
#include <dt-bindings/clock/qcom,rpmh.h>
65+
#include <dt-bindings/power/qcom-rpmpd.h>
66+
clock-controller@ad00000 {
67+
compatible = "qcom,sm8150-camcc";
68+
reg = <0x0ad00000 0x10000>;
69+
clocks = <&rpmhcc RPMH_CXO_CLK>,
70+
<&gcc GCC_CAMERA_AHB_CLK>;
71+
power-domains = <&rpmhpd SM8150_MMCX>;
72+
required-opps = <&rpmhpd_opp_low_svs>;
73+
#clock-cells = <1>;
74+
#reset-cells = <1>;
75+
#power-domain-cells = <1>;
76+
};
77+
...

‎Documentation/devicetree/bindings/clock/qcom,sm8450-camcc.yaml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ description: |
2121
include/dt-bindings/clock/qcom,sm8650-camcc.h
2222
include/dt-bindings/clock/qcom,x1e80100-camcc.h
2323
24-
allOf:
25-
- $ref: qcom,gcc.yaml#
26-
2724
properties:
2825
compatible:
2926
enum:
@@ -57,7 +54,21 @@ required:
5754
- compatible
5855
- clocks
5956
- power-domains
60-
- required-opps
57+
58+
allOf:
59+
- $ref: qcom,gcc.yaml#
60+
- if:
61+
properties:
62+
compatible:
63+
contains:
64+
enum:
65+
- qcom,sc8280xp-camcc
66+
- qcom,sm8450-camcc
67+
- qcom,sm8550-camcc
68+
- qcom,x1e80100-camcc
69+
then:
70+
required:
71+
- required-opps
6172

6273
unevaluatedProperties: false
6374

‎Documentation/devicetree/bindings/clock/qcom,sm8450-gpucc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ description: |
1414
domains on Qualcomm SoCs.
1515
1616
See also::
17+
include/dt-bindings/clock/qcom,sm4450-gpucc.h
1718
include/dt-bindings/clock/qcom,sm8450-gpucc.h
1819
include/dt-bindings/clock/qcom,sm8550-gpucc.h
1920
include/dt-bindings/reset/qcom,sm8450-gpucc.h
@@ -23,6 +24,7 @@ description: |
2324
properties:
2425
compatible:
2526
enum:
27+
- qcom,sm4450-gpucc
2628
- qcom,sm8450-gpucc
2729
- qcom,sm8550-gpucc
2830
- qcom,sm8650-gpucc

‎Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,20 @@ required:
4444
- compatible
4545
- clocks
4646
- power-domains
47-
- required-opps
4847
- '#power-domain-cells'
4948

5049
allOf:
5150
- $ref: qcom,gcc.yaml#
51+
- if:
52+
properties:
53+
compatible:
54+
contains:
55+
enum:
56+
- qcom,sm8450-videocc
57+
- qcom,sm8550-videocc
58+
then:
59+
required:
60+
- required-opps
5261

5362
unevaluatedProperties: false
5463

0 commit comments

Comments
 (0)