Skip to content

Commit 03be434

Browse files
committed
Merge branches 'clk-microchip', 'clk-samsung' and 'clk-qcom' into clk-next
* clk-microchip: clk, reset: microchip: mpfs: fix incorrect preprocessor conditions clock, reset: microchip: move all mpfs reset code to the reset subsystem * clk-samsung: clk: samsung: Don't register clkdev lookup for the fixed rate clocks clk: samsung: gs101: drop unused HSI2 clock parent data clk: samsung: gs101: mark some apm UASC and XIU clocks critical clk: samsung: gs101: add support for cmu_hsi2 clk: samsung: gs101: add support for cmu_hsi0 dt-bindings: clock: google,gs101-clock: add HSI2 clock management unit dt-bindings: clock: google,gs101-clock: add HSI0 clock management unit clk: samsung: gs101: propagate PERIC1 USI SPI clock rate clk: samsung: gs101: propagate PERIC0 USI SPI clock rate clk: samsung: exynosautov9: fix wrong pll clock id value dt-bindings: clock: samsung,s3c6400-clock: convert to DT Schema clk: samsung: exynos850: Add CMU_CPUCL0 and CMU_CPUCL1 clk: samsung: Implement manual PLL control for ARM64 SoCs * clk-qcom: (27 commits) clk: qcom: clk-alpha-pll: fix rate setting for Stromer PLLs clk: qcom: apss-ipq-pll: fix PLL rate for IPQ5018 clk: qcom: Fix SM_GPUCC_8650 dependencies clk: qcom: Fix SC_CAMCC_8280XP dependencies clk: qcom: mmcc-msm8998: fix venus clock issue clk: qcom: dispcc-sm8650: fix DisplayPort clocks clk: qcom: dispcc-sm8550: fix DisplayPort clocks clk: qcom: dispcc-sm6350: fix DisplayPort clocks clk: qcom: dispcc-sm8450: fix DisplayPort clocks clk: qcom: clk-cbf-8996: use HUAYRA_APSS register map for cbf_pll clk: qcom: apss-ipq-pll: constify clk_init_data structures clk: qcom: apss-ipq-pll: constify match data structures clk: qcom: apss-ipq-pll: move Huayra register map to 'clk_alpha_pll_regs' clk: qcom: apss-ipq-pll: reuse Stromer reg offsets from 'clk_alpha_pll_regs' clk: qcom: apss-ipq-pll: use stromer ops for IPQ5018 to fix boot failure clk: qcom: gcc-ipq8074: rework nss_port5/6 clock to multiple conf clk: qcom: clk-rcg2: add support for rcg2 freq multi ops clk: qcom: clk-rcg: introduce support for multiple conf for same freq clk: qcom: hfpll: Add QCS404-specific compatible dt-bindings: clock: qcom,hfpll: Convert to YAML ...
4 parents 4a35e6f + bc2da26 + 0dc83ad + e221138 commit 03be434

35 files changed

+2346
-607
lines changed

Documentation/devicetree/bindings/clock/google,gs101-clock.yaml

Lines changed: 53 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,18 @@ properties:
3030
- google,gs101-cmu-top
3131
- google,gs101-cmu-apm
3232
- google,gs101-cmu-misc
33+
- google,gs101-cmu-hsi0
34+
- google,gs101-cmu-hsi2
3335
- google,gs101-cmu-peric0
3436
- google,gs101-cmu-peric1
3537

3638
clocks:
3739
minItems: 1
38-
maxItems: 3
40+
maxItems: 5
3941

4042
clock-names:
4143
minItems: 1
42-
maxItems: 3
44+
maxItems: 5
4345

4446
"#clock-cells":
4547
const: 1
@@ -72,6 +74,55 @@ allOf:
7274
items:
7375
- const: oscclk
7476

77+
- if:
78+
properties:
79+
compatible:
80+
contains:
81+
const: google,gs101-cmu-hsi0
82+
83+
then:
84+
properties:
85+
clocks:
86+
items:
87+
- description: External reference clock (24.576 MHz)
88+
- description: HSI0 bus clock (from CMU_TOP)
89+
- description: DPGTC (from CMU_TOP)
90+
- description: USB DRD controller clock (from CMU_TOP)
91+
- description: USB Display Port debug clock (from CMU_TOP)
92+
93+
clock-names:
94+
items:
95+
- const: oscclk
96+
- const: bus
97+
- const: dpgtc
98+
- const: usb31drd
99+
- const: usbdpdbg
100+
101+
- if:
102+
properties:
103+
compatible:
104+
contains:
105+
enum:
106+
- google,gs101-cmu-hsi2
107+
108+
then:
109+
properties:
110+
clocks:
111+
items:
112+
- description: External reference clock (24.576 MHz)
113+
- description: High Speed Interface bus clock (from CMU_TOP)
114+
- description: High Speed Interface pcie clock (from CMU_TOP)
115+
- description: High Speed Interface ufs clock (from CMU_TOP)
116+
- description: High Speed Interface mmc clock (from CMU_TOP)
117+
118+
clock-names:
119+
items:
120+
- const: oscclk
121+
- const: bus
122+
- const: pcie
123+
- const: ufs
124+
- const: mmc
125+
75126
- if:
76127
properties:
77128
compatible:

Documentation/devicetree/bindings/clock/qcom,hfpll.txt

Lines changed: 0 additions & 63 deletions
This file was deleted.
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
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,hfpll.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm High-Frequency PLL
8+
9+
maintainers:
10+
- Bjorn Andersson <andersson@kernel.org>
11+
12+
description:
13+
The HFPLL is used as CPU PLL on various Qualcomm SoCs.
14+
15+
properties:
16+
compatible:
17+
oneOf:
18+
- enum:
19+
- qcom,msm8974-hfpll
20+
- qcom,msm8976-hfpll-a53
21+
- qcom,msm8976-hfpll-a72
22+
- qcom,msm8976-hfpll-cci
23+
- qcom,qcs404-hfpll
24+
- const: qcom,hfpll
25+
deprecated: true
26+
27+
reg:
28+
items:
29+
- description: HFPLL registers
30+
- description: Alias register region
31+
minItems: 1
32+
33+
'#clock-cells':
34+
const: 0
35+
36+
clocks:
37+
items:
38+
- description: board XO clock
39+
40+
clock-names:
41+
items:
42+
- const: xo
43+
44+
clock-output-names:
45+
description:
46+
Name of the PLL. Typically hfpllX where X is a CPU number starting at 0.
47+
Otherwise hfpll_Y where Y is more specific such as "l2".
48+
maxItems: 1
49+
50+
required:
51+
- compatible
52+
- reg
53+
- '#clock-cells'
54+
- clocks
55+
- clock-names
56+
- clock-output-names
57+
58+
additionalProperties: false
59+
60+
examples:
61+
- |
62+
clock-controller@f908a000 {
63+
compatible = "qcom,msm8974-hfpll";
64+
reg = <0xf908a000 0x30>, <0xf900a000 0x30>;
65+
#clock-cells = <0>;
66+
clock-output-names = "hfpll0";
67+
clocks = <&xo_board>;
68+
clock-names = "xo";
69+
};
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/samsung,s3c6400-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Samsung S3C6400 SoC clock controller
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <krzk@kernel.org>
11+
12+
description: |
13+
There are several clocks that are generated outside the SoC. It is expected
14+
that they are defined using standard clock bindings with following
15+
clock-output-names and/or provided as clock inputs to this clock controller:
16+
- "fin_pll" - PLL input clock (xtal/extclk) - required,
17+
- "xusbxti" - USB xtal - required,
18+
- "iiscdclk0" - I2S0 codec clock - optional,
19+
- "iiscdclk1" - I2S1 codec clock - optional,
20+
- "iiscdclk2" - I2S2 codec clock - optional,
21+
- "pcmcdclk0" - PCM0 codec clock - optional,
22+
- "pcmcdclk1" - PCM1 codec clock - optional, only S3C6410.
23+
24+
All available clocks are defined as preprocessor macros in
25+
include/dt-bindings/clock/samsung,s3c64xx-clock.h header.
26+
27+
properties:
28+
compatible:
29+
enum:
30+
- samsung,s3c6400-clock
31+
- samsung,s3c6410-clock
32+
33+
reg:
34+
maxItems: 1
35+
36+
clocks:
37+
maxItems: 1
38+
39+
"#clock-cells":
40+
const: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
- clocks
46+
- "#clock-cells"
47+
48+
additionalProperties: false
49+
50+
examples:
51+
- |
52+
clock-controller@7e00f000 {
53+
compatible = "samsung,s3c6410-clock";
54+
reg = <0x7e00f000 0x1000>;
55+
#clock-cells = <1>;
56+
clocks = <&fin_pll>;
57+
};

Documentation/devicetree/bindings/clock/samsung,s3c64xx-clock.txt

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)