Skip to content

Commit 0ff347d

Browse files
smaeuljernejsk
authored andcommitted
clk: sunxi-ng: Move SoC driver conditions to dependencies
Do not duplicate the same expression on the `default` line, so the two lines do not need to be kept in sync. Drivers stay disabled under COMPILE_TEST because of the `default ARCH_SUNXI` applied to SUNXI_CCU. Three drivers had no conditions. - SUN6I_RTC_CCU and SUN8I_DE2_CCU are used on current hardware regardless of CPU architecture. - SUN8I_R_CCU is only used on pre-H6 SoCs, which means no RISCV SoCs. Acked-by: Jernej Skrabec <[email protected]> Signed-off-by: Samuel Holland <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jernej Skrabec <[email protected]>
1 parent a26dc09 commit 0ff347d

File tree

1 file changed

+24
-22
lines changed

1 file changed

+24
-22
lines changed

drivers/clk/sunxi-ng/Kconfig

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,111 +9,113 @@ if SUNXI_CCU
99

1010
config SUNIV_F1C100S_CCU
1111
tristate "Support for the Allwinner newer F1C100s CCU"
12-
default MACH_SUNIV
12+
default y
1313
depends on MACH_SUNIV || COMPILE_TEST
1414

1515
config SUN20I_D1_CCU
1616
tristate "Support for the Allwinner D1 CCU"
17-
default RISCV
17+
default y
1818
depends on RISCV || COMPILE_TEST
1919

2020
config SUN20I_D1_R_CCU
2121
tristate "Support for the Allwinner D1 PRCM CCU"
22-
default RISCV
22+
default y
2323
depends on RISCV || COMPILE_TEST
2424

2525
config SUN50I_A64_CCU
2626
tristate "Support for the Allwinner A64 CCU"
27-
default ARM64
27+
default y
2828
depends on ARM64 || COMPILE_TEST
2929

3030
config SUN50I_A100_CCU
3131
tristate "Support for the Allwinner A100 CCU"
32-
default ARM64
32+
default y
3333
depends on ARM64 || COMPILE_TEST
3434

3535
config SUN50I_A100_R_CCU
3636
tristate "Support for the Allwinner A100 PRCM CCU"
37-
default ARM64
37+
default y
3838
depends on ARM64 || COMPILE_TEST
3939

4040
config SUN50I_H6_CCU
4141
tristate "Support for the Allwinner H6 CCU"
42-
default ARM64
42+
default y
4343
depends on ARM64 || COMPILE_TEST
4444

4545
config SUN50I_H616_CCU
4646
tristate "Support for the Allwinner H616 CCU"
47-
default ARM64
47+
default y
4848
depends on ARM64 || COMPILE_TEST
4949

5050
config SUN50I_H6_R_CCU
5151
tristate "Support for the Allwinner H6 and H616 PRCM CCU"
52-
default ARM64
52+
default y
5353
depends on ARM64 || COMPILE_TEST
5454

5555
config SUN4I_A10_CCU
5656
tristate "Support for the Allwinner A10/A20 CCU"
57-
default MACH_SUN4I
58-
default MACH_SUN7I
57+
default y
5958
depends on MACH_SUN4I || MACH_SUN7I || COMPILE_TEST
6059

6160
config SUN5I_CCU
6261
bool "Support for the Allwinner sun5i family CCM"
63-
default MACH_SUN5I
62+
default y
6463
depends on MACH_SUN5I || COMPILE_TEST
6564
depends on SUNXI_CCU=y
6665

6766
config SUN6I_A31_CCU
6867
tristate "Support for the Allwinner A31/A31s CCU"
69-
default MACH_SUN6I
68+
default y
7069
depends on MACH_SUN6I || COMPILE_TEST
7170

7271
config SUN6I_RTC_CCU
7372
tristate "Support for the Allwinner H616/R329 RTC CCU"
7473
default y
74+
depends on MACH_SUN8I || ARM64 || RISCV || COMPILE_TEST
7575

7676
config SUN8I_A23_CCU
7777
tristate "Support for the Allwinner A23 CCU"
78-
default MACH_SUN8I
78+
default y
7979
depends on MACH_SUN8I || COMPILE_TEST
8080

8181
config SUN8I_A33_CCU
8282
tristate "Support for the Allwinner A33 CCU"
83-
default MACH_SUN8I
83+
default y
8484
depends on MACH_SUN8I || COMPILE_TEST
8585

8686
config SUN8I_A83T_CCU
8787
tristate "Support for the Allwinner A83T CCU"
88-
default MACH_SUN8I
88+
default y
8989
depends on MACH_SUN8I || COMPILE_TEST
9090

9191
config SUN8I_H3_CCU
9292
tristate "Support for the Allwinner H3 CCU"
93-
default MACH_SUN8I || ARM64
93+
default y
9494
depends on MACH_SUN8I || ARM64 || COMPILE_TEST
9595

9696
config SUN8I_V3S_CCU
9797
tristate "Support for the Allwinner V3s CCU"
98-
default MACH_SUN8I
98+
default y
9999
depends on MACH_SUN8I || COMPILE_TEST
100100

101101
config SUN8I_DE2_CCU
102102
tristate "Support for the Allwinner SoCs DE2 CCU"
103-
default MACH_SUN8I || ARM64
103+
default y
104+
depends on MACH_SUN8I || ARM64 || RISCV || COMPILE_TEST
104105

105106
config SUN8I_R40_CCU
106107
tristate "Support for the Allwinner R40 CCU"
107-
default MACH_SUN8I
108+
default y
108109
depends on MACH_SUN8I || COMPILE_TEST
109110

110111
config SUN9I_A80_CCU
111112
tristate "Support for the Allwinner A80 CCU"
112-
default MACH_SUN9I
113+
default y
113114
depends on MACH_SUN9I || COMPILE_TEST
114115

115116
config SUN8I_R_CCU
116117
tristate "Support for Allwinner SoCs' PRCM CCUs"
117-
default MACH_SUN8I || ARM64
118+
default y
119+
depends on MACH_SUN8I || ARM64 || COMPILE_TEST
118120

119121
endif

0 commit comments

Comments
 (0)