Skip to content

Commit d289ca7

Browse files
committed
Merge tag 'samsung-clk-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-samsung
Pull Samsung SoC clock driver updates from Krzysztof Kozlowski: Google GS101: - Register the CMU MISC clock controller earlier, so the Multi Core Timer clocksource can use it - Add PERIC0 and PERIC1 clock controllers Exynos850: - Add PDMA clocks - Add CPU cluster 0 and 1 (CMU_CPUCLK0/CMU_CPUCLK1) clock controllers - Propagate SPI IPCLK rate change to parents, so the SPI will get proper clock rates - Refactor the generic Samsung CPU clock controllers code, preparing it for supporting Exynos850 CPU clocks * tag 'samsung-clk-6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (25 commits) clk: samsung: Add CPU clock support for Exynos850 clk: samsung: Pass mask to wait_until_mux_stable() clk: samsung: Keep register offsets in chip specific structure clk: samsung: Keep CPU clock chip specific data in a dedicated struct clk: samsung: Pass register layout type explicitly to CLK_CPU() clk: samsung: Pass actual CPU clock registers base to CPU_CLK() clk: samsung: Group CPU clock functions by chip clk: samsung: Use single CPU clock notifier callback for all chips clk: samsung: Reduce params count in exynos_register_cpu_clock() clk: samsung: Pull struct exynos_cpuclk into clk-cpu.c clk: samsung: Improve clk-cpu.c style dt-bindings: clock: exynos850: Add CMU_CPUCLK0 and CMU_CPUCL1 clk: samsung: gs101: add support for cmu_peric1 clk: samsung: gs101: drop extra empty line dt-bindings: clock: google,gs101-clock: add PERIC1 clock management unit clk: samsung: exynos850: Propagate SPI IPCLK rate change clk: samsung: gs101: gpio_peric0_pclk needs to be kept on clk: samsung: exynos850: Add PDMA clocks dt-bindings: clock: tesla,fsd: Fix spelling mistake clk: samsung: gs101: add support for cmu_peric0 ...
2 parents 6613476 + 61f4399 commit d289ca7

File tree

15 files changed

+1660
-242
lines changed

15 files changed

+1660
-242
lines changed

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

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@ properties:
3030
- google,gs101-cmu-top
3131
- google,gs101-cmu-apm
3232
- google,gs101-cmu-misc
33+
- google,gs101-cmu-peric0
34+
- google,gs101-cmu-peric1
3335

3436
clocks:
3537
minItems: 1
36-
maxItems: 2
38+
maxItems: 3
3739

3840
clock-names:
3941
minItems: 1
40-
maxItems: 2
42+
maxItems: 3
4143

4244
"#clock-cells":
4345
const: 1
@@ -85,8 +87,30 @@ allOf:
8587

8688
clock-names:
8789
items:
88-
- const: dout_cmu_misc_bus
89-
- const: dout_cmu_misc_sss
90+
- const: bus
91+
- const: sss
92+
93+
- if:
94+
properties:
95+
compatible:
96+
contains:
97+
enum:
98+
- google,gs101-cmu-peric0
99+
- google,gs101-cmu-peric1
100+
101+
then:
102+
properties:
103+
clocks:
104+
items:
105+
- description: External reference clock (24.576 MHz)
106+
- description: Connectivity Peripheral 0/1 bus clock (from CMU_TOP)
107+
- description: Connectivity Peripheral 0/1 IP clock (from CMU_TOP)
108+
109+
clock-names:
110+
items:
111+
- const: oscclk
112+
- const: bus
113+
- const: ip
90114

91115
additionalProperties: false
92116

Documentation/devicetree/bindings/clock/samsung,exynos850-clock.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ properties:
3636
- samsung,exynos850-cmu-aud
3737
- samsung,exynos850-cmu-cmgp
3838
- samsung,exynos850-cmu-core
39+
- samsung,exynos850-cmu-cpucl0
40+
- samsung,exynos850-cmu-cpucl1
3941
- samsung,exynos850-cmu-dpu
4042
- samsung,exynos850-cmu-g3d
4143
- samsung,exynos850-cmu-hsi
@@ -152,6 +154,46 @@ allOf:
152154
- const: dout_core_mmc_embd
153155
- const: dout_core_sss
154156

157+
- if:
158+
properties:
159+
compatible:
160+
contains:
161+
const: samsung,exynos850-cmu-cpucl0
162+
163+
then:
164+
properties:
165+
clocks:
166+
items:
167+
- description: External reference clock (26 MHz)
168+
- description: CPUCL0 switch clock (from CMU_TOP)
169+
- description: CPUCL0 debug clock (from CMU_TOP)
170+
171+
clock-names:
172+
items:
173+
- const: oscclk
174+
- const: dout_cpucl0_switch
175+
- const: dout_cpucl0_dbg
176+
177+
- if:
178+
properties:
179+
compatible:
180+
contains:
181+
const: samsung,exynos850-cmu-cpucl1
182+
183+
then:
184+
properties:
185+
clocks:
186+
items:
187+
- description: External reference clock (26 MHz)
188+
- description: CPUCL1 switch clock (from CMU_TOP)
189+
- description: CPUCL1 debug clock (from CMU_TOP)
190+
191+
clock-names:
192+
items:
193+
- const: oscclk
194+
- const: dout_cpucl1_switch
195+
- const: dout_cpucl1_dbg
196+
155197
- if:
156198
properties:
157199
compatible:

Documentation/devicetree/bindings/clock/tesla,fsd-clock.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ maintainers:
1212

1313
description: |
1414
FSD clock controller consist of several clock management unit
15-
(CMU), which generates clocks for various inteernal SoC blocks.
15+
(CMU), which generates clocks for various internal SoC blocks.
1616
The root clock comes from external OSC clock (24 MHz).
1717
1818
All available clocks are defined as preprocessor macros in

0 commit comments

Comments
 (0)