Skip to content

Commit c30cc9f

Browse files
committed
Merge branches 'clk-rockchip', 'clk-thead', 'clk-microchip', 'clk-imx' and 'clk-qcom' into clk-next
* clk-rockchip: clk: rockchip: rk3568: Add PLL rate for 132MHz * clk-thead: clk: thead: th1520-ap: Describe mux clocks with clk_mux clk: thead: th1520-ap: Correctly refer the parent of osc_12m clk: thead: Mark essential bus clocks as CLK_IGNORE_UNUSED * clk-microchip: clk: at91: sam9x7: update pll clk ranges * clk-imx: MAINTAINERS: Update i.MX Clock Entry clk: imx95-blk-ctl: Add clock for i.MX94 LVDS/Display CSR clk: imx95-blk-ctl: Rename lvds and displaymix csr blk clk: imx95-blk-ctl: Fix synchronous abort dt-bindings: clock: Add support for i.MX94 LVDS/DISPLAY CSR clk: imx: Fix an out-of-bounds access in dispmix_csr_clk_dev_data * clk-qcom: (65 commits) dt-bindings: clock: qcom,sm4450-dispcc: Reference qcom,gcc.yaml dt-bindings: clock: qcom,sm4450-camcc: Reference qcom,gcc.yaml dt-bindings: clock: qcom,mmcc: Reference qcom,gcc.yaml dt-bindings: clock: qcom,sm8150-camcc: Reference qcom,gcc.yaml dt-bindings: clock: qcom: Remove double colon from description clk: qcom: Add Video Clock controller (VIDEOCC) driver for Milos dt-bindings: clock: qcom: document the Milos Video Clock Controller clk: qcom: Add Graphics Clock controller (GPUCC) driver for Milos dt-bindings: clock: qcom: document the Milos GPU Clock Controller clk: qcom: Add Display Clock controller (DISPCC) driver for Milos dt-bindings: clock: qcom: document the Milos Display Clock Controller clk: qcom: Add Camera Clock controller (CAMCC) driver for Milos dt-bindings: clock: qcom: document the Milos Camera Clock Controller clk: qcom: Add Global Clock controller (GCC) driver for Milos dt-bindings: clock: qcom: document the Milos Global Clock Controller clk: qcom: common: Add support to register rcg dfs in qcom_cc_really_probe clk: qcom: gcc-x1e80100: Add missing video resets dt-bindings: clock: qcom,x1e80100-gcc: Add missing video resets clk: qcom: videocc-sm8550: Add separate frequency tables for X1E80100 clk: qcom: videocc-sm8550: Allow building without SM8550/SM8560 GCC ...
6 parents e3abdd1 + a0a6f59 + 853a7a6 + 53afec2 + f46c06a + be72da7 commit c30cc9f

File tree

80 files changed

+16264
-486
lines changed

Some content is hidden

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

80 files changed

+16264
-486
lines changed

Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ properties:
1313
compatible:
1414
items:
1515
- enum:
16+
- nxp,imx94-display-csr
17+
- nxp,imx94-lvds-csr
1618
- nxp,imx95-camera-csr
1719
- nxp,imx95-display-csr
1820
- nxp,imx95-hsio-blk-ctl

Documentation/devicetree/bindings/clock/qcom,ipq9574-cmn-pll.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ description:
2424
properties:
2525
compatible:
2626
enum:
27+
- qcom,ipq5018-cmn-pll
28+
- qcom,ipq5424-cmn-pll
2729
- qcom,ipq9574-cmn-pll
2830

2931
reg:
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
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,milos-camcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller on Milos
8+
9+
maintainers:
10+
- Luca Weiss <[email protected]>
11+
12+
description: |
13+
Qualcomm camera clock control module provides the clocks, resets and power
14+
domains on Milos.
15+
16+
See also: include/dt-bindings/clock/qcom,milos-camcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,milos-camcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: Sleep clock source
26+
- description: Camera AHB clock from GCC
27+
28+
required:
29+
- compatible
30+
- clocks
31+
32+
allOf:
33+
- $ref: qcom,gcc.yaml#
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/qcom,milos-gcc.h>
40+
clock-controller@adb0000 {
41+
compatible = "qcom,milos-camcc";
42+
reg = <0x0adb0000 0x40000>;
43+
clocks = <&bi_tcxo_div2>,
44+
<&sleep_clk>,
45+
<&gcc GCC_CAMERA_AHB_CLK>;
46+
#clock-cells = <1>;
47+
#reset-cells = <1>;
48+
#power-domain-cells = <1>;
49+
};
50+
51+
...
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,milos-dispcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Display Clock & Reset Controller on Milos
8+
9+
maintainers:
10+
- Luca Weiss <[email protected]>
11+
12+
description: |
13+
Qualcomm display clock control module provides the clocks, resets and power
14+
domains on Milos.
15+
16+
See also: include/dt-bindings/clock/qcom,milos-dispcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,milos-dispcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: Sleep clock source
26+
- description: Display's AHB clock
27+
- description: GPLL0 source from GCC
28+
- description: Byte clock from DSI PHY0
29+
- description: Pixel clock from DSI PHY0
30+
- description: Link clock from DP PHY0
31+
- description: VCO DIV clock from DP PHY0
32+
33+
required:
34+
- compatible
35+
- clocks
36+
- '#power-domain-cells'
37+
38+
allOf:
39+
- $ref: qcom,gcc.yaml#
40+
41+
unevaluatedProperties: false
42+
43+
examples:
44+
- |
45+
#include <dt-bindings/clock/qcom,milos-gcc.h>
46+
#include <dt-bindings/phy/phy-qcom-qmp.h>
47+
clock-controller@af00000 {
48+
compatible = "qcom,milos-dispcc";
49+
reg = <0x0af00000 0x20000>;
50+
clocks = <&bi_tcxo_div2>,
51+
<&sleep_clk>,
52+
<&gcc GCC_DISP_AHB_CLK>,
53+
<&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>,
54+
<&mdss_dsi0_phy 0>,
55+
<&mdss_dsi0_phy 1>,
56+
<&usb_dp_qmpphy QMP_USB43DP_DP_LINK_CLK>,
57+
<&usb_dp_qmpphy QMP_USB43DP_DP_VCO_DIV_CLK>;
58+
#clock-cells = <1>;
59+
#reset-cells = <1>;
60+
#power-domain-cells = <1>;
61+
};
62+
63+
...
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,milos-gcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller on Milos
8+
9+
maintainers:
10+
- Luca Weiss <[email protected]>
11+
12+
description: |
13+
Qualcomm global clock control module provides the clocks, resets and power
14+
domains on Milos.
15+
16+
See also: include/dt-bindings/clock/qcom,milos-gcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,milos-gcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: Sleep clock source
26+
- description: PCIE 0 Pipe clock source
27+
- description: PCIE 1 Pipe clock source
28+
- description: UFS Phy Rx symbol 0 clock source
29+
- description: UFS Phy Rx symbol 1 clock source
30+
- description: UFS Phy Tx symbol 0 clock source
31+
- description: USB3 Phy wrapper pipe clock source
32+
33+
required:
34+
- compatible
35+
- clocks
36+
- '#power-domain-cells'
37+
38+
allOf:
39+
- $ref: qcom,gcc.yaml#
40+
41+
unevaluatedProperties: false
42+
43+
examples:
44+
- |
45+
#include <dt-bindings/clock/qcom,rpmh.h>
46+
clock-controller@100000 {
47+
compatible = "qcom,milos-gcc";
48+
reg = <0x00100000 0x1f4200>;
49+
clocks = <&rpmhcc RPMH_CXO_CLK>,
50+
<&sleep_clk>,
51+
<&pcie0_phy>,
52+
<&pcie1_phy>,
53+
<&ufs_mem_phy 0>,
54+
<&ufs_mem_phy 1>,
55+
<&ufs_mem_phy 2>,
56+
<&usb_1_qmpphy>;
57+
#clock-cells = <1>;
58+
#reset-cells = <1>;
59+
#power-domain-cells = <1>;
60+
};
61+
62+
...
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
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,milos-videocc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Video Clock & Reset Controller on Milos
8+
9+
maintainers:
10+
- Luca Weiss <[email protected]>
11+
12+
description: |
13+
Qualcomm video clock control module provides the clocks, resets and power
14+
domains on Milos.
15+
16+
See also: include/dt-bindings/clock/qcom,milos-videocc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,milos-videocc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: Board active XO source
26+
- description: Sleep clock source
27+
- description: Video AHB clock from GCC
28+
29+
required:
30+
- compatible
31+
- clocks
32+
33+
allOf:
34+
- $ref: qcom,gcc.yaml#
35+
36+
unevaluatedProperties: false
37+
38+
examples:
39+
- |
40+
#include <dt-bindings/clock/qcom,milos-gcc.h>
41+
clock-controller@aaf0000 {
42+
compatible = "qcom,milos-videocc";
43+
reg = <0x0aaf0000 0x10000>;
44+
clocks = <&bi_tcxo_div2>,
45+
<&bi_tcxo_ao_div2>,
46+
<&sleep_clk>,
47+
<&gcc GCC_VIDEO_AHB_CLK>;
48+
#clock-cells = <1>;
49+
#reset-cells = <1>;
50+
#power-domain-cells = <1>;
51+
};
52+
53+
...

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,36 +38,16 @@ properties:
3838
minItems: 7
3939
maxItems: 13
4040

41-
'#clock-cells':
42-
const: 1
43-
44-
'#reset-cells':
45-
const: 1
46-
47-
'#power-domain-cells':
48-
const: 1
49-
50-
reg:
51-
maxItems: 1
52-
53-
protected-clocks:
54-
description:
55-
Protected clock specifier list as per common clock binding
56-
5741
vdd-gfx-supply:
5842
description:
5943
Regulator supply for the GPU_GX GDSC
6044

6145
required:
6246
- compatible
63-
- reg
64-
- '#clock-cells'
65-
- '#reset-cells'
6647
- '#power-domain-cells'
6748

68-
additionalProperties: false
69-
7049
allOf:
50+
- $ref: qcom,gcc.yaml#
7151
- if:
7252
properties:
7353
compatible:
@@ -351,6 +331,8 @@ allOf:
351331
- const: dp_link_2x_clk_divsel_five
352332
- const: dp_vco_divided_clk_src_mux
353333

334+
unevaluatedProperties: false
335+
354336
examples:
355337
# Example for MMCC for MSM8960:
356338
- |
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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,qcs615-dispcc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Display Clock & Reset Controller on QCS615
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 QCS615.
15+
16+
See also: include/dt-bindings/clock/qcom,qcs615-dispcc.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,qcs615-dispcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: GPLL0 clock source from GCC
26+
- description: Byte clock from DSI PHY0
27+
- description: Pixel clock from DSI PHY0
28+
- description: Pixel clock from DSI PHY1
29+
- description: Display port PLL link clock
30+
- description: Display port PLL VCO DIV clock
31+
32+
allOf:
33+
- $ref: qcom,gcc.yaml#
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/clock/qcom,rpmh.h>
40+
#include <dt-bindings/clock/qcom,qcs615-gcc.h>
41+
clock-controller@af00000 {
42+
compatible = "qcom,qcs615-dispcc";
43+
reg = <0x0af00000 0x20000>;
44+
clocks = <&rpmhcc RPMH_CXO_CLK>,
45+
<&gcc GCC_DISP_GPLL0_DIV_CLK_SRC>,
46+
<&mdss_dsi0_phy 0>,
47+
<&mdss_dsi0_phy 1>,
48+
<&mdss_dsi1_phy 0>,
49+
<&mdss_dp_phy 0>,
50+
<&mdss_dp_vco 0>;
51+
#clock-cells = <1>;
52+
#reset-cells = <1>;
53+
#power-domain-cells = <1>;
54+
};
55+
...

0 commit comments

Comments
 (0)