Skip to content

Commit a26dc09

Browse files
smaeuljernejsk
authored andcommitted
clk: sunxi-ng: Remove duplicate ARCH_SUNXI dependencies
SUNXI_CCU already depends on ARCH_SUNXI, so adding the dependency to individual SoC drivers is redundant. Drivers stay disabled under COMPILE_TEST because of the `default ARCH_SUNXI` applied to SUNXI_CCU. Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Signed-off-by: Samuel Holland <samuel@sholland.org> Link: https://lore.kernel.org/r/20221231231429.18357-2-samuel@sholland.org Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
1 parent 657f477 commit a26dc09

1 file changed

Lines changed: 21 additions & 22 deletions

File tree

drivers/clk/sunxi-ng/Kconfig

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,43 +14,43 @@ config SUNIV_F1C100S_CCU
1414

1515
config SUN20I_D1_CCU
1616
tristate "Support for the Allwinner D1 CCU"
17-
default RISCV && ARCH_SUNXI
18-
depends on (RISCV && ARCH_SUNXI) || COMPILE_TEST
17+
default RISCV
18+
depends on RISCV || COMPILE_TEST
1919

2020
config SUN20I_D1_R_CCU
2121
tristate "Support for the Allwinner D1 PRCM CCU"
22-
default RISCV && ARCH_SUNXI
23-
depends on (RISCV && ARCH_SUNXI) || COMPILE_TEST
22+
default RISCV
23+
depends on RISCV || COMPILE_TEST
2424

2525
config SUN50I_A64_CCU
2626
tristate "Support for the Allwinner A64 CCU"
27-
default ARM64 && ARCH_SUNXI
28-
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
27+
default ARM64
28+
depends on ARM64 || COMPILE_TEST
2929

3030
config SUN50I_A100_CCU
3131
tristate "Support for the Allwinner A100 CCU"
32-
default ARM64 && ARCH_SUNXI
33-
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
32+
default ARM64
33+
depends on ARM64 || COMPILE_TEST
3434

3535
config SUN50I_A100_R_CCU
3636
tristate "Support for the Allwinner A100 PRCM CCU"
37-
default ARM64 && ARCH_SUNXI
38-
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
37+
default ARM64
38+
depends on ARM64 || COMPILE_TEST
3939

4040
config SUN50I_H6_CCU
4141
tristate "Support for the Allwinner H6 CCU"
42-
default ARM64 && ARCH_SUNXI
43-
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
42+
default ARM64
43+
depends on ARM64 || COMPILE_TEST
4444

4545
config SUN50I_H616_CCU
4646
tristate "Support for the Allwinner H616 CCU"
47-
default ARM64 && ARCH_SUNXI
48-
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
47+
default ARM64
48+
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 && ARCH_SUNXI
53-
depends on (ARM64 && ARCH_SUNXI) || COMPILE_TEST
52+
default ARM64
53+
depends on ARM64 || COMPILE_TEST
5454

5555
config SUN4I_A10_CCU
5656
tristate "Support for the Allwinner A10/A20 CCU"
@@ -71,8 +71,7 @@ config SUN6I_A31_CCU
7171

7272
config SUN6I_RTC_CCU
7373
tristate "Support for the Allwinner H616/R329 RTC CCU"
74-
default ARCH_SUNXI
75-
depends on ARCH_SUNXI || COMPILE_TEST
74+
default y
7675

7776
config SUN8I_A23_CCU
7877
tristate "Support for the Allwinner A23 CCU"
@@ -91,8 +90,8 @@ config SUN8I_A83T_CCU
9190

9291
config SUN8I_H3_CCU
9392
tristate "Support for the Allwinner H3 CCU"
94-
default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
95-
depends on MACH_SUN8I || (ARM64 && ARCH_SUNXI) || COMPILE_TEST
93+
default MACH_SUN8I || ARM64
94+
depends on MACH_SUN8I || ARM64 || COMPILE_TEST
9695

9796
config SUN8I_V3S_CCU
9897
tristate "Support for the Allwinner V3s CCU"
@@ -101,7 +100,7 @@ config SUN8I_V3S_CCU
101100

102101
config SUN8I_DE2_CCU
103102
tristate "Support for the Allwinner SoCs DE2 CCU"
104-
default MACH_SUN8I || (ARM64 && ARCH_SUNXI)
103+
default MACH_SUN8I || ARM64
105104

106105
config SUN8I_R40_CCU
107106
tristate "Support for the Allwinner R40 CCU"
@@ -115,6 +114,6 @@ config SUN9I_A80_CCU
115114

116115
config SUN8I_R_CCU
117116
tristate "Support for Allwinner SoCs' PRCM CCUs"
118-
default MACH_SUN8I || (ARCH_SUNXI && ARM64)
117+
default MACH_SUN8I || ARM64
119118

120119
endif

0 commit comments

Comments
 (0)