Skip to content

Commit 597fe80

Browse files
committed
Merge tag 'sunxi-clk-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull Allwinner clk driver updates from Chen-Yu Tsai: In this cycle support for power-of-two single divider clocks was added. This covers some of the clocks found in the A523 MCU PRCM clock and reset controller, for which support was added as well. Besides the new controller, a missing clock was added for the A523's main clock controller. The RTC clock driver gained specifics for the A523's RTC block for tweaking the clock rate of the internal oscillator to get it closer to what the RTC needs. * tag 'sunxi-clk-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: clk: sunxi-ng: add support for the A523/T527 MCU CCU clk: sunxi-ng: div: support power-of-two dividers clk: sunxi-ng: sun55i-a523-ccu: Add missing NPU module clock dt-bindings: clock: sun55i-a523-ccu: Add A523 MCU CCU clock controller dt-bindings: clock: sun55i-a523-ccu: Add missing NPU module clock clk: sunxi-ng: sun6i-rtc: Add A523 specifics
2 parents 8f5ae30 + 598e4b6 commit 597fe80

11 files changed

Lines changed: 643 additions & 19 deletions

File tree

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

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,19 @@ properties:
1919
compatible:
2020
enum:
2121
- allwinner,sun55i-a523-ccu
22+
- allwinner,sun55i-a523-mcu-ccu
2223
- allwinner,sun55i-a523-r-ccu
2324

2425
reg:
2526
maxItems: 1
2627

2728
clocks:
2829
minItems: 4
29-
maxItems: 5
30+
maxItems: 9
3031

3132
clock-names:
3233
minItems: 4
33-
maxItems: 5
34+
maxItems: 9
3435

3536
required:
3637
- "#clock-cells"
@@ -63,6 +64,38 @@ allOf:
6364
- const: iosc
6465
- const: losc-fanout
6566

67+
- if:
68+
properties:
69+
compatible:
70+
enum:
71+
- allwinner,sun55i-a523-mcu-ccu
72+
73+
then:
74+
properties:
75+
clocks:
76+
items:
77+
- description: High Frequency Oscillator (usually at 24MHz)
78+
- description: Low Frequency Oscillator (usually at 32kHz)
79+
- description: Internal Oscillator
80+
- description: Audio PLL (4x)
81+
- description: Peripherals PLL 0 (300 MHz output)
82+
- description: DSP module clock
83+
- description: MBUS clock
84+
- description: PRCM AHB clock
85+
- description: PRCM APB0 clock
86+
87+
clock-names:
88+
items:
89+
- const: hosc
90+
- const: losc
91+
- const: iosc
92+
- const: pll-audio0-4x
93+
- const: pll-periph0-300m
94+
- const: dsp
95+
- const: mbus
96+
- const: r-ahb
97+
- const: r-apb0
98+
6699
- if:
67100
properties:
68101
compatible:

drivers/clk/sunxi-ng/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ config SUN55I_A523_CCU
5757
default ARCH_SUNXI
5858
depends on ARM64 || COMPILE_TEST
5959

60+
config SUN55I_A523_MCU_CCU
61+
tristate "Support for the Allwinner A523/T527 MCU CCU"
62+
default ARCH_SUNXI
63+
depends on ARM64 || COMPILE_TEST
64+
6065
config SUN55I_A523_R_CCU
6166
tristate "Support for the Allwinner A523/T527 PRCM CCU"
6267
default ARCH_SUNXI

drivers/clk/sunxi-ng/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ obj-$(CONFIG_SUN50I_H6_CCU) += sun50i-h6-ccu.o
3434
obj-$(CONFIG_SUN50I_H6_R_CCU) += sun50i-h6-r-ccu.o
3535
obj-$(CONFIG_SUN50I_H616_CCU) += sun50i-h616-ccu.o
3636
obj-$(CONFIG_SUN55I_A523_CCU) += sun55i-a523-ccu.o
37+
obj-$(CONFIG_SUN55I_A523_MCU_CCU) += sun55i-a523-mcu-ccu.o
3738
obj-$(CONFIG_SUN55I_A523_R_CCU) += sun55i-a523-r-ccu.o
3839
obj-$(CONFIG_SUN4I_A10_CCU) += sun4i-a10-ccu.o
3940
obj-$(CONFIG_SUN5I_CCU) += sun5i-ccu.o
@@ -61,6 +62,7 @@ sun50i-h6-ccu-y += ccu-sun50i-h6.o
6162
sun50i-h6-r-ccu-y += ccu-sun50i-h6-r.o
6263
sun50i-h616-ccu-y += ccu-sun50i-h616.o
6364
sun55i-a523-ccu-y += ccu-sun55i-a523.o
65+
sun55i-a523-mcu-ccu-y += ccu-sun55i-a523-mcu.o
6466
sun55i-a523-r-ccu-y += ccu-sun55i-a523-r.o
6567
sun4i-a10-ccu-y += ccu-sun4i-a10.o
6668
sun5i-ccu-y += ccu-sun5i.o

0 commit comments

Comments
 (0)