Skip to content

Commit e988adc

Browse files
bebarinobebarino
committed
Merge branches 'clk-allwinner', 'clk-amlogic' and 'clk-qcom' into clk-next
* clk-allwinner: clk: sunxi-ng: add support for the A523/T527 PRCM CCU clk: sunxi-ng: a523: add reset lines clk: sunxi-ng: a523: add bus clock gates clk: sunxi-ng: a523: remaining mod clocks clk: sunxi-ng: a523: add USB mod clocks clk: sunxi-ng: a523: add interface mod clocks clk: sunxi-ng: a523: add system mod clocks clk: sunxi-ng: a523: add video mod clocks clk: sunxi-ng: a523: Add support for bus clocks clk: sunxi-ng: Add support for the A523/T527 CCU PLLs dt-bindings: clk: sunxi-ng: document two Allwinner A523 CCUs clk: sunxi-ng: Add support for update bit clk: sunxi-ng: mp: provide wrappers for setting feature flags clk: sunxi-ng: mp: introduce dual-divider clock clk: sunxi-ng: h616: Reparent GPU clock during frequency changes clk: sunxi-ng: h616: Add clock/reset for LCD TCON dt-bindings: clock: sun50i-h616-ccu: Add LCD TCON clk and reset * clk-amlogic: 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 * clk-qcom: (41 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 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: qcom: gcc-sm8650: Do not turn off USB GDSCs during gdsc_disable() clk: qcom: videocc: Constify 'struct qcom_cc_desc' clk: qcom: gpucc: Constify 'struct qcom_cc_desc' clk: qcom: dispcc: Constify 'struct qcom_cc_desc' clk: qcom: camcc: Constify 'struct qcom_cc_desc' dt-bindings: clock: qcom: sm8450-camcc: Remove qcom,x1e80100-camcc leftover clk: qcom: Add support for Video Clock Controller on QCS8300 clk: qcom: Add support for GPU Clock Controller on QCS8300 ...
4 parents 3ce2e14 + 054b4ea + 0a1f6dd + f00618a commit e988adc

File tree

116 files changed

+6536
-237
lines changed

Some content is hidden

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

116 files changed

+6536
-237
lines changed

‎Documentation/devicetree/bindings/clock/allwinner,sun55i-a523-ccu.yaml

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/qcom,gpucc.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ title: Qualcomm Graphics Clock & Reset Controller
88

99
maintainers:
1010
- Taniya Das <quic_tdas@quicinc.com>
11+
- Imran Shaik <quic_imrashai@quicinc.com>
1112

1213
description: |
1314
Qualcomm graphics clock control module provides the clocks, resets and power
@@ -23,10 +24,12 @@ description: |
2324
include/dt-bindings/clock/qcom,gpucc-sm8150.h
2425
include/dt-bindings/clock/qcom,gpucc-sm8250.h
2526
include/dt-bindings/clock/qcom,gpucc-sm8350.h
27+
include/dt-bindings/clock/qcom,qcs8300-gpucc.h
2628
2729
properties:
2830
compatible:
2931
enum:
32+
- qcom,qcs8300-gpucc
3033
- qcom,sdm845-gpucc
3134
- qcom,sa8775p-gpucc
3235
- qcom,sc7180-gpucc

‎Documentation/devicetree/bindings/clock/qcom,ipq9574-nsscc.yaml

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,sa8775p-camcc.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,20 @@ title: Qualcomm Camera Clock & Reset Controller on SA8775P
88

99
maintainers:
1010
- Taniya Das <quic_tdas@quicinc.com>
11+
- Imran Shaik <quic_imrashai@quicinc.com>
1112

1213
description: |
1314
Qualcomm camera clock control module provides the clocks, resets and power
1415
domains on SA8775p.
1516
16-
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
See also:
18+
include/dt-bindings/clock/qcom,qcs8300-camcc.h
19+
include/dt-bindings/clock/qcom,sa8775p-camcc.h
1720
1821
properties:
1922
compatible:
2023
enum:
24+
- qcom,qcs8300-camcc
2125
- qcom,sa8775p-camcc
2226

2327
clocks:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ description: |
1818
properties:
1919
compatible:
2020
enum:
21+
- qcom,qcs8300-videocc
2122
- qcom,sa8775p-videocc
2223

2324
clocks:

‎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>;

‎drivers/clk/meson/a1-pll.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ static struct platform_driver a1_pll_clkc_driver = {
356356
};
357357
module_platform_driver(a1_pll_clkc_driver);
358358

359-
MODULE_DESCRIPTION("Amlogic S4 PLL Clock Controller driver");
359+
MODULE_DESCRIPTION("Amlogic A1 PLL Clock Controller driver");
360360
MODULE_AUTHOR("Jian Hu <jian.hu@amlogic.com>");
361361
MODULE_AUTHOR("Dmitry Rokosov <ddrokosov@sberdevices.ru>");
362362
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)