Skip to content

Commit 59c3541

Browse files
committed
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk updates from Stephen Boyd: "Here's the pile of clk driver patches. The usual suspects^Wsilicon vendors are all here, adding new SoC support and fixing existing code. There are a few patches to the clk framework here as well. They've been baking in linux-next for weeks so I'm hoping we don't have to revert them. The disable OF node patch is probably the scariest one although it seems unlikely that a system would be relying on a driver _not_ probing because the clk never appeared, but you never know. Nothing looks out of the ordinary on the driver side but that's because it's mostly a bunch of data. Core: - Use dev_err_probe() in the clk registration path (Peering into the crystal ball shows many patches that remove printks) - Check for disabled OF nodes in of_clk_get_hw_from_clkspec() New Drivers: - Allwinner A523/T527 clk driver - Qualcomm IPQ9574 NSS clk driver - Qualcomm QCS8300 GPU and video clk drivers - Qualcomm SDM429 RPM clks - Qualcomm QCM6490 LPASS (low power audio) resets - Samsung Exynos2200: driver for several clock controllers (Alive, CMGP, HSI, PERIC/PERIS, TOP, UFS and VFS) - Samsung Exynos7870: Driver for several clock controllers (Alive, MIF, DISP AUD, FSYS, G3D, ISP, MFC and PERI) - Rockchip rk3528 and rk3562 clk driver Updates: - Various fixes to SoC clk drivers for incorrect data, avoid touching protected registers, etc. - Additions for some missing clks in existing SoC clk drivers - DT schema conversions from text to YAML - Kconfig cleanups to allow drivers to be compiled on moar architectures" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (125 commits) clk: qcom: Add NSS clock Controller driver for IPQ9574 clk: qcom: gcc-ipq9574: Add support for gpll0_out_aux clock dt-bindings: clock: Add ipq9574 NSSCC clock and reset definitions dt-bindings: clock: gcc-ipq9574: Add definition for GPLL0_OUT_AUX clk: qcom: gcc-msm8953: fix stuck venus0_core0 clock clk: qcom: mmcc-sdm660: fix stuck video_subcore0 clock dt-bindings: clock: qcom,x1e80100-camcc: Fix the list of required-opps clk: amlogic: a1: fix a typo clk: amlogic: gxbb: drop non existing 32k clock parent clk: amlogic: gxbb: drop incorrect flag on 32k clock clk: amlogic: g12b: fix cluster A parent data clk: amlogic: g12a: fix mmc A peripheral clock dt-bindings: clocks: atmel,at91rm9200-pmc: add missing compatibles dt-bindings: reset: fix double id on rk3562-cru reset ids drivers: clk: qcom: ipq5424: fix the freq table of sdcc1_apps clock clk: qcom: lpassaudiocc-sc7280: Add support for LPASS resets for QCM6490 dt-bindings: clock: qcom: Add compatible for QCM6490 boards clk: qcom: gdsc: Update the status poll timeout for GDSC clk: qcom: gdsc: Set retain_ff before moving to HW CTRL clk: davinci: remove support for da830 ...
2 parents 472863a + e988adc commit 59c3541

File tree

200 files changed

+18152
-658
lines changed

Some content is hidden

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

200 files changed

+18152
-658
lines changed
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/allwinner,sun55i-a523-ccu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Allwinner A523 Clock Control Unit
8+
9+
maintainers:
10+
- Andre Przywara <andre.przywara@arm.com>
11+
12+
properties:
13+
"#clock-cells":
14+
const: 1
15+
16+
"#reset-cells":
17+
const: 1
18+
19+
compatible:
20+
enum:
21+
- allwinner,sun55i-a523-ccu
22+
- allwinner,sun55i-a523-r-ccu
23+
24+
reg:
25+
maxItems: 1
26+
27+
clocks:
28+
minItems: 4
29+
maxItems: 5
30+
31+
clock-names:
32+
minItems: 4
33+
maxItems: 5
34+
35+
required:
36+
- "#clock-cells"
37+
- "#reset-cells"
38+
- compatible
39+
- reg
40+
- clocks
41+
- clock-names
42+
43+
allOf:
44+
- if:
45+
properties:
46+
compatible:
47+
enum:
48+
- allwinner,sun55i-a523-ccu
49+
50+
then:
51+
properties:
52+
clocks:
53+
items:
54+
- description: High Frequency Oscillator (usually at 24MHz)
55+
- description: Low Frequency Oscillator (usually at 32kHz)
56+
- description: Internal Oscillator
57+
- description: Low Frequency Oscillator fanout
58+
59+
clock-names:
60+
items:
61+
- const: hosc
62+
- const: losc
63+
- const: iosc
64+
- const: losc-fanout
65+
66+
- if:
67+
properties:
68+
compatible:
69+
enum:
70+
- allwinner,sun55i-a523-r-ccu
71+
72+
then:
73+
properties:
74+
clocks:
75+
items:
76+
- description: High Frequency Oscillator (usually at 24MHz)
77+
- description: Low Frequency Oscillator (usually at 32kHz)
78+
- description: Internal Oscillator
79+
- description: Peripherals PLL
80+
- description: Audio PLL
81+
82+
clock-names:
83+
items:
84+
- const: hosc
85+
- const: losc
86+
- const: iosc
87+
- const: pll-periph
88+
- const: pll-audio
89+
90+
additionalProperties: false
91+
92+
examples:
93+
- |
94+
clock-controller@2001000 {
95+
compatible = "allwinner,sun55i-a523-ccu";
96+
reg = <0x02001000 0x1000>;
97+
clocks = <&osc24M>, <&osc32k>, <&iosc>, <&r_ccu 1>;
98+
clock-names = "hosc", "losc", "iosc", "losc-fanout";
99+
#clock-cells = <1>;
100+
#reset-cells = <1>;
101+
};
102+
103+
...

Documentation/devicetree/bindings/clock/atmel,at91rm9200-pmc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ properties:
3434
- enum:
3535
- atmel,at91rm9200-pmc
3636
- atmel,at91sam9260-pmc
37+
- atmel,at91sam9261-pmc
38+
- atmel,at91sam9263-pmc
3739
- atmel,at91sam9g45-pmc
3840
- atmel,at91sam9n12-pmc
3941
- atmel,at91sam9rl-pmc
@@ -111,6 +113,8 @@ allOf:
111113
enum:
112114
- atmel,at91rm9200-pmc
113115
- atmel,at91sam9260-pmc
116+
- atmel,at91sam9261-pmc
117+
- atmel,at91sam9263-pmc
114118
- atmel,at91sam9g20-pmc
115119
then:
116120
properties:

Documentation/devicetree/bindings/clock/imx8m-clock.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ properties:
4343
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx8m-clock.h
4444
for the full list of i.MX8M clock IDs.
4545

46+
fsl,operating-mode:
47+
$ref: /schemas/types.yaml#/definitions/string
48+
enum: [nominal, overdrive]
49+
description:
50+
The operating mode of the SoC. This affects the maximum clock rates that
51+
can safely be configured by the clock controller.
52+
4653
required:
4754
- compatible
4855
- reg
@@ -109,6 +116,7 @@ examples:
109116
<&clk_ext3>, <&clk_ext4>;
110117
clock-names = "osc_32k", "osc_24m", "clk_ext1", "clk_ext2",
111118
"clk_ext3", "clk_ext4";
119+
fsl,operating-mode = "nominal";
112120
};
113121
114122
- |

Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ properties:
2424
maxItems: 1
2525

2626
clocks:
27-
minItems: 7
28-
maxItems: 7
27+
minItems: 8
28+
maxItems: 8
2929

3030
clock-names:
3131
items:
@@ -36,6 +36,7 @@ properties:
3636
- const: sai5
3737
- const: sai6
3838
- const: sai7
39+
- const: axi
3940

4041
'#clock-cells':
4142
const: 1
@@ -72,10 +73,11 @@ examples:
7273
<&clk IMX8MP_CLK_SAI3>,
7374
<&clk IMX8MP_CLK_SAI5>,
7475
<&clk IMX8MP_CLK_SAI6>,
75-
<&clk IMX8MP_CLK_SAI7>;
76+
<&clk IMX8MP_CLK_SAI7>,
77+
<&clk IMX8MP_CLK_AUDIO_AXI_ROOT>;
7678
clock-names = "ahb",
7779
"sai1", "sai2", "sai3",
78-
"sai5", "sai6", "sai7";
80+
"sai5", "sai6", "sai7", "axi";
7981
power-domains = <&pgc_audio>;
8082
};
8183

Documentation/devicetree/bindings/clock/mediatek,mt8188-clock.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,27 @@ required:
5757
- reg
5858
- '#clock-cells'
5959

60+
allOf:
61+
- if:
62+
properties:
63+
compatible:
64+
contains:
65+
enum:
66+
- mediatek,mt8188-camsys-rawa
67+
- mediatek,mt8188-camsys-rawb
68+
- mediatek,mt8188-camsys-yuva
69+
- mediatek,mt8188-camsys-yuvb
70+
- mediatek,mt8188-imgsys-wpe1
71+
- mediatek,mt8188-imgsys-wpe2
72+
- mediatek,mt8188-imgsys-wpe3
73+
- mediatek,mt8188-imgsys1-dip-nr
74+
- mediatek,mt8188-imgsys1-dip-top
75+
- mediatek,mt8188-ipesys
76+
77+
then:
78+
required:
79+
- '#reset-cells'
80+
6081
additionalProperties: false
6182

6283
examples:
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
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,ipq9574-nsscc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Networking Sub System Clock & Reset Controller on IPQ9574
8+
9+
maintainers:
10+
- Bjorn Andersson <andersson@kernel.org>
11+
- Anusha Rao <quic_anusha@quicinc.com>
12+
13+
description: |
14+
Qualcomm networking sub system clock control module provides the clocks,
15+
resets on IPQ9574
16+
17+
See also::
18+
include/dt-bindings/clock/qcom,ipq9574-nsscc.h
19+
include/dt-bindings/reset/qcom,ipq9574-nsscc.h
20+
21+
properties:
22+
compatible:
23+
const: qcom,ipq9574-nsscc
24+
25+
clocks:
26+
items:
27+
- description: Board XO source
28+
- description: CMN_PLL NSS 1200MHz (Bias PLL cc) clock source
29+
- description: CMN_PLL PPE 353MHz (Bias PLL ubi nc) clock source
30+
- description: GCC GPLL0 OUT AUX clock source
31+
- description: Uniphy0 NSS Rx clock source
32+
- description: Uniphy0 NSS Tx clock source
33+
- description: Uniphy1 NSS Rx clock source
34+
- description: Uniphy1 NSS Tx clock source
35+
- description: Uniphy2 NSS Rx clock source
36+
- description: Uniphy2 NSS Tx clock source
37+
- description: GCC NSSCC clock source
38+
39+
'#interconnect-cells':
40+
const: 1
41+
42+
clock-names:
43+
items:
44+
- const: xo
45+
- const: nss_1200
46+
- const: ppe_353
47+
- const: gpll0_out
48+
- const: uniphy0_rx
49+
- const: uniphy0_tx
50+
- const: uniphy1_rx
51+
- const: uniphy1_tx
52+
- const: uniphy2_rx
53+
- const: uniphy2_tx
54+
- const: bus
55+
56+
required:
57+
- compatible
58+
- clocks
59+
- clock-names
60+
61+
allOf:
62+
- $ref: qcom,gcc.yaml#
63+
64+
unevaluatedProperties: false
65+
66+
examples:
67+
- |
68+
#include <dt-bindings/clock/qcom,ipq9574-gcc.h>
69+
#include <dt-bindings/clock/qcom,ipq-cmn-pll.h>
70+
clock-controller@39b00000 {
71+
compatible = "qcom,ipq9574-nsscc";
72+
reg = <0x39b00000 0x80000>;
73+
clocks = <&xo_board_clk>,
74+
<&cmn_pll NSS_1200MHZ_CLK>,
75+
<&cmn_pll PPE_353MHZ_CLK>,
76+
<&gcc GPLL0_OUT_AUX>,
77+
<&uniphy 0>,
78+
<&uniphy 1>,
79+
<&uniphy 2>,
80+
<&uniphy 3>,
81+
<&uniphy 4>,
82+
<&uniphy 5>,
83+
<&gcc GCC_NSSCC_CLK>;
84+
clock-names = "xo",
85+
"nss_1200",
86+
"ppe_353",
87+
"gpll0_out",
88+
"uniphy0_rx",
89+
"uniphy0_tx",
90+
"uniphy1_rx",
91+
"uniphy1_tx",
92+
"uniphy2_rx",
93+
"uniphy2_tx",
94+
"bus";
95+
#clock-cells = <1>;
96+
#reset-cells = <1>;
97+
};
98+
...

Documentation/devicetree/bindings/clock/qcom,rpmcc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444
- qcom,rpmcc-msm8998
4545
- qcom,rpmcc-qcm2290
4646
- qcom,rpmcc-qcs404
47+
- qcom,rpmcc-sdm429
4748
- qcom,rpmcc-sdm660
4849
- qcom,rpmcc-sm6115
4950
- qcom,rpmcc-sm6125
@@ -123,6 +124,7 @@ allOf:
123124
- qcom,rpmcc-msm8998
124125
- qcom,rpmcc-qcm2290
125126
- qcom,rpmcc-qcs404
127+
- qcom,rpmcc-sdm429
126128
- qcom,rpmcc-sdm660
127129
- qcom,rpmcc-sm6115
128130
- qcom,rpmcc-sm6125

Documentation/devicetree/bindings/clock/qcom,sc7280-lpasscorecc.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ description: |
2020
properties:
2121
compatible:
2222
enum:
23+
- qcom,qcm6490-lpassaudiocc
2324
- qcom,sc7280-lpassaoncc
2425
- qcom,sc7280-lpassaudiocc
2526
- qcom,sc7280-lpasscorecc
@@ -68,7 +69,9 @@ allOf:
6869
properties:
6970
compatible:
7071
contains:
71-
const: qcom,sc7280-lpassaudiocc
72+
enum:
73+
- qcom,qcm6490-lpassaudiocc
74+
- qcom,sc7280-lpassaudiocc
7275

7376
then:
7477
properties:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ allOf:
6464
- qcom,sc8280xp-camcc
6565
- qcom,sm8450-camcc
6666
- qcom,sm8550-camcc
67-
- qcom,x1e80100-camcc
6867
then:
6968
required:
7069
- required-opps

Documentation/devicetree/bindings/clock/qcom,x1e80100-camcc.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ properties:
4040
- description: A phandle to the MMCX power-domain
4141

4242
required-opps:
43-
maxItems: 1
44-
description:
45-
A phandle to an OPP node describing MMCX performance points.
43+
items:
44+
- description: A phandle to an OPP node describing MXC performance points
45+
- description: A phandle to an OPP node describing MMCX performance points
4646

4747
required:
4848
- compatible
@@ -66,7 +66,8 @@ examples:
6666
<&sleep_clk>;
6767
power-domains = <&rpmhpd RPMHPD_MXC>,
6868
<&rpmhpd RPMHPD_MMCX>;
69-
required-opps = <&rpmhpd_opp_low_svs>;
69+
required-opps = <&rpmhpd_opp_low_svs>,
70+
<&rpmhpd_opp_low_svs>;
7071
#clock-cells = <1>;
7172
#reset-cells = <1>;
7273
#power-domain-cells = <1>;

0 commit comments

Comments
 (0)