Skip to content

Commit 21a5352

Browse files
committed
Merge branches 'clk-marvell', 'clk-adi', 'clk-qcom' and 'clk-devm' into clk-next
- Add devm_clk_bulk_get_all_enabled() to return number of clks acquired - Marvell PXA1908 SoC clks * clk-marvell: clk: mmp: Add Marvell PXA1908 MPMU driver clk: mmp: Add Marvell PXA1908 APMU driver clk: mmp: Add Marvell PXA1908 APBCP driver clk: mmp: Add Marvell PXA1908 APBC driver dt-bindings: clock: Add Marvell PXA1908 clock bindings clk: mmp: Switch to use struct u32_fract instead of custom one * clk-adi: clk: clk-axi-clkgen: make sure to enable the AXI bus clock dt-bindings: clock: axi-clkgen: include AXI clk * clk-qcom: (43 commits) clk: qcom: remove unused data from gcc-ipq5424.c clk: qcom: Add support for Global Clock Controller on QCS8300 dt-bindings: clock: qcom: Add GCC clocks for QCS8300 clk: qcom: add Global Clock controller (GCC) driver for IPQ5424 SoC clk: qcom: clk-alpha-pll: Add NSS HUAYRA ALPHA PLL support for ipq9574 dt-bindings: clock: Add Qualcomm IPQ5424 GCC binding clk: qcom: add SAR2130P GPU Clock Controller support clk: qcom: dispcc-sm8550: enable support for SAR2130P clk: qcom: tcsrcc-sm8550: add SAR2130P support clk: qcom: add support for GCC on SAR2130P clk: qcom: rpmh: add support for SAR2130P clk: qcom: rcg2: add clk_rcg2_shared_floor_ops dt-bindings: clk: qcom,sm8450-gpucc: add SAR2130P compatibles dt-bindings: clock: qcom,sm8550-dispcc: Add SAR2130P compatible dt-bindings: clock: qcom,sm8550-tcsr: Add SAR2130P compatible dt-bindings: clock: qcom: document SAR2130P Global Clock Controller dt-bindings: clock: qcom,rpmhcc: Add SAR2130P compatible clk: qcom: Make GCC_6125 depend on QCOM_GDSC dt-bindings: clock: qcom: gcc-ipq9574: remove q6 bring up clock macros dt-bindings: clock: qcom: gcc-ipq5332: remove q6 bring up clock macros ... * clk-devm: clk: Provide devm_clk_bulk_get_all_enabled() helper
5 parents 0cf32b1 + ebac87c + c64ef7e + 4adb920 + 51e32e8 commit 21a5352

Some content is hidden

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

69 files changed

+18265
-876
lines changed

Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,21 @@ properties:
2626
description:
2727
Specifies the reference clock(s) from which the output frequency is
2828
derived. This must either reference one clock if only the first clock
29-
input is connected or two if both clock inputs are connected.
30-
minItems: 1
31-
maxItems: 2
29+
input is connected or two if both clock inputs are connected. The last
30+
clock is the AXI bus clock that needs to be enabled so we can access the
31+
core registers.
32+
minItems: 2
33+
maxItems: 3
34+
35+
clock-names:
36+
oneOf:
37+
- items:
38+
- const: clkin1
39+
- const: s_axi_aclk
40+
- items:
41+
- const: clkin1
42+
- const: clkin2
43+
- const: s_axi_aclk
3244

3345
'#clock-cells':
3446
const: 0
@@ -40,6 +52,7 @@ required:
4052
- compatible
4153
- reg
4254
- clocks
55+
- clock-names
4356
- '#clock-cells'
4457

4558
additionalProperties: false
@@ -50,5 +63,6 @@ examples:
5063
compatible = "adi,axi-clkgen-2.00.a";
5164
#clock-cells = <0>;
5265
reg = <0xff000000 0x1000>;
53-
clocks = <&osc 1>;
66+
clocks = <&osc 1>, <&clkc 15>;
67+
clock-names = "clkin1", "s_axi_aclk";
5468
};
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/marvell,pxa1908.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Marvell PXA1908 Clock Controllers
8+
9+
maintainers:
10+
- Duje Mihanović <[email protected]>
11+
12+
description: |
13+
The PXA1908 clock subsystem generates and supplies clock to various
14+
controllers within the PXA1908 SoC. The PXA1908 contains numerous clock
15+
controller blocks, with the ones currently supported being APBC, APBCP, MPMU
16+
and APMU roughly corresponding to internal buses.
17+
18+
All these clock identifiers could be found in <include/dt-bindings/marvell,pxa1908.h>.
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- marvell,pxa1908-apbc
24+
- marvell,pxa1908-apbcp
25+
- marvell,pxa1908-mpmu
26+
- marvell,pxa1908-apmu
27+
28+
reg:
29+
maxItems: 1
30+
31+
'#clock-cells':
32+
const: 1
33+
34+
required:
35+
- compatible
36+
- reg
37+
- '#clock-cells'
38+
39+
additionalProperties: false
40+
41+
examples:
42+
# APMU block:
43+
- |
44+
clock-controller@d4282800 {
45+
compatible = "marvell,pxa1908-apmu";
46+
reg = <0xd4282800 0x400>;
47+
#clock-cells = <1>;
48+
};

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ description: |
1717
1818
properties:
1919
compatible:
20-
const: qcom,gcc-sm8450
20+
enum:
21+
- qcom,gcc-sm8450
22+
- qcom,sm8475-gcc
2123

2224
clocks:
2325
items:

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

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,35 @@
44
$id: http://devicetree.org/schemas/clock/qcom,ipq5332-gcc.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Qualcomm Global Clock & Reset Controller on IPQ5332
7+
title: Qualcomm Global Clock & Reset Controller on IPQ5332 and IPQ5424
88

99
maintainers:
1010
- Bjorn Andersson <[email protected]>
1111

1212
description: |
1313
Qualcomm global clock control module provides the clocks, resets and power
14-
domains on IPQ5332.
14+
domains on IPQ5332 and IPQ5424.
1515
16-
See also:: include/dt-bindings/clock/qcom,gcc-ipq5332.h
17-
18-
allOf:
19-
- $ref: qcom,gcc.yaml#
16+
See also:
17+
include/dt-bindings/clock/qcom,gcc-ipq5332.h
18+
include/dt-bindings/clock/qcom,gcc-ipq5424.h
2019
2120
properties:
2221
compatible:
23-
const: qcom,ipq5332-gcc
22+
enum:
23+
- qcom,ipq5332-gcc
24+
- qcom,ipq5424-gcc
2425

2526
clocks:
27+
minItems: 5
2628
items:
2729
- description: Board XO clock source
2830
- description: Sleep clock source
2931
- description: PCIE 2lane PHY pipe clock source
3032
- description: PCIE 2lane x1 PHY pipe clock source (For second lane)
3133
- description: USB PCIE wrapper pipe clock source
34+
- description: PCIE 2-lane PHY2 pipe clock source
35+
- description: PCIE 2-lane PHY3 pipe clock source
3236

3337
'#power-domain-cells': false
3438
'#interconnect-cells':
@@ -38,6 +42,29 @@ required:
3842
- compatible
3943
- clocks
4044

45+
allOf:
46+
- $ref: qcom,gcc.yaml#
47+
- if:
48+
properties:
49+
compatible:
50+
contains:
51+
const: qcom,ipq5332-gcc
52+
then:
53+
properties:
54+
clocks:
55+
maxItems: 5
56+
57+
- if:
58+
properties:
59+
compatible:
60+
contains:
61+
const: qcom,ipq5424-gcc
62+
then:
63+
properties:
64+
clocks:
65+
minItems: 7
66+
maxItems: 7
67+
4168
unevaluatedProperties: false
4269

4370
examples:
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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,qcs8300-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Technologies, Inc. Global Clock & Reset Controller on QCS8300
8+
9+
maintainers:
10+
- Taniya Das <[email protected]>
11+
- Imran Shaik <[email protected]>
12+
13+
description: |
14+
Qualcomm Technologies, Inc. Global clock control module provides the clocks, resets and
15+
power domains on QCS8300
16+
17+
See also: include/dt-bindings/clock/qcom,qcs8300-gcc.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,qcs8300-gcc
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: Sleep clock source
27+
- description: PCIE 0 Pipe clock source
28+
- description: PCIE 1 Pipe clock source
29+
- description: PCIE Phy Auxiliary clock source
30+
- description: First EMAC controller reference clock
31+
- description: UFS Phy Rx symbol 0 clock source
32+
- description: UFS Phy Rx symbol 1 clock source
33+
- description: UFS Phy Tx symbol 0 clock source
34+
- description: USB3 Phy wrapper pipe clock source
35+
36+
required:
37+
- compatible
38+
- clocks
39+
- '#power-domain-cells'
40+
41+
allOf:
42+
- $ref: qcom,gcc.yaml#
43+
44+
unevaluatedProperties: false
45+
46+
examples:
47+
- |
48+
#include <dt-bindings/clock/qcom,rpmh.h>
49+
clock-controller@100000 {
50+
compatible = "qcom,qcs8300-gcc";
51+
reg = <0x00100000 0xc7018>;
52+
clocks = <&rpmhcc RPMH_CXO_CLK>,
53+
<&sleep_clk>,
54+
<&pcie_0_pipe_clk>,
55+
<&pcie_1_pipe_clk>,
56+
<&pcie_phy_aux_clk>,
57+
<&rxc0_ref_clk>,
58+
<&ufs_phy_rx_symbol_0_clk>,
59+
<&ufs_phy_rx_symbol_1_clk>,
60+
<&ufs_phy_tx_symbol_0_clk>,
61+
<&usb3_phy_wrapper_gcc_usb30_prim_pipe_clk>;
62+
#clock-cells = <1>;
63+
#reset-cells = <1>;
64+
#power-domain-cells = <1>;
65+
};
66+
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
enum:
2020
- qcom,qdu1000-rpmh-clk
2121
- qcom,sa8775p-rpmh-clk
22+
- qcom,sar2130p-rpmh-clk
2223
- qcom,sc7180-rpmh-clk
2324
- qcom,sc7280-rpmh-clk
2425
- qcom,sc8180x-rpmh-clk
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
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,sa8775p-camcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller on SA8775P
8+
9+
maintainers:
10+
- Taniya Das <[email protected]>
11+
12+
description: |
13+
Qualcomm camera clock control module provides the clocks, resets and power
14+
domains on SA8775p.
15+
16+
See also: include/dt-bindings/clock/qcom,sa8775p-camcc.h
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- qcom,sa8775p-camcc
22+
23+
clocks:
24+
items:
25+
- description: Camera AHB clock from GCC
26+
- description: Board XO source
27+
- description: Board active XO source
28+
- description: Sleep clock source
29+
30+
power-domains:
31+
maxItems: 1
32+
description: MMCX power domain
33+
34+
required:
35+
- compatible
36+
- clocks
37+
- power-domains
38+
- '#power-domain-cells'
39+
40+
allOf:
41+
- $ref: qcom,gcc.yaml#
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/clock/qcom,rpmh.h>
48+
#include <dt-bindings/power/qcom-rpmpd.h>
49+
#include <dt-bindings/clock/qcom,sa8775p-gcc.h>
50+
clock-controller@ade0000 {
51+
compatible = "qcom,sa8775p-camcc";
52+
reg = <0x0ade0000 0x20000>;
53+
clocks = <&gcc GCC_CAMERA_AHB_CLK>,
54+
<&rpmhcc RPMH_CXO_CLK>,
55+
<&rpmhcc RPMH_CXO_CLK_A>,
56+
<&sleep_clk>;
57+
power-domains = <&rpmhpd SA8775P_MMCX>;
58+
#clock-cells = <1>;
59+
#reset-cells = <1>;
60+
#power-domain-cells = <1>;
61+
};
62+
...
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
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,sa8775p-dispcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Display Clock & Reset Controller on SA8775P
8+
9+
maintainers:
10+
- Taniya Das <[email protected]>
11+
12+
description: |
13+
Qualcomm display clock control module provides the clocks, resets and power
14+
domains on SA8775P.
15+
16+
See also: include/dt-bindings/clock/qcom,sa8775p-dispcc.h
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- qcom,sa8775p-dispcc0
22+
- qcom,sa8775p-dispcc1
23+
24+
clocks:
25+
items:
26+
- description: GCC AHB clock source
27+
- description: Board XO source
28+
- description: Board XO_AO source
29+
- description: Sleep clock source
30+
- description: Link clock from DP0 PHY
31+
- description: VCO DIV clock from DP0 PHY
32+
- description: Link clock from DP1 PHY
33+
- description: VCO DIV clock from DP1 PHY
34+
- description: Byte clock from DSI0 PHY
35+
- description: Pixel clock from DSI0 PHY
36+
- description: Byte clock from DSI1 PHY
37+
- description: Pixel clock from DSI1 PHY
38+
39+
power-domains:
40+
maxItems: 1
41+
description: MMCX power domain
42+
43+
required:
44+
- compatible
45+
- clocks
46+
- power-domains
47+
- '#power-domain-cells'
48+
49+
allOf:
50+
- $ref: qcom,gcc.yaml#
51+
52+
unevaluatedProperties: false
53+
54+
examples:
55+
- |
56+
#include <dt-bindings/clock/qcom,rpmh.h>
57+
#include <dt-bindings/power/qcom-rpmpd.h>
58+
#include <dt-bindings/clock/qcom,sa8775p-gcc.h>
59+
clock-controller@af00000 {
60+
compatible = "qcom,sa8775p-dispcc0";
61+
reg = <0x0af00000 0x20000>;
62+
clocks = <&gcc GCC_DISP_AHB_CLK>,
63+
<&rpmhcc RPMH_CXO_CLK>,
64+
<&rpmhcc RPMH_CXO_CLK_A>,
65+
<&sleep_clk>,
66+
<&dp_phy0 0>,
67+
<&dp_phy0 1>,
68+
<&dp_phy1 2>,
69+
<&dp_phy1 3>,
70+
<&dsi_phy0 0>,
71+
<&dsi_phy0 1>,
72+
<&dsi_phy1 2>,
73+
<&dsi_phy1 3>;
74+
power-domains = <&rpmhpd SA8775P_MMCX>;
75+
#clock-cells = <1>;
76+
#reset-cells = <1>;
77+
#power-domain-cells = <1>;
78+
};
79+
...

0 commit comments

Comments
 (0)