Skip to content

Commit 915fb0e

Browse files
cyyselfConchuOD
authored andcommitted
soc: canaan: Deprecate SOC_CANAAN and use SOC_CANAAN_K210 for K210
Since SOC_FOO should be deprecated from patch [1], and cleanup for other SoCs is already in the mailing list [2,3,4], we remove the use of SOC_CANAAN and use ARCH_CANAAN for SoCs vendored by Canaan instead from now on. Thus, we should also change the Makefile here to use ARCH_CANAAN. Then, since we have introduced SOC_CANAAN_K210 for K210-specific drivers, we should replace its drivers depends on SOC_CANAAN_K210 and default select when it has the symbol SOC_CANAAN_K210. [1] https://lore.kernel.org/linux-riscv/20221121221414.109965-1-conor@kernel.org/ [2] https://lore.kernel.org/linux-riscv/20240305-praying-clad-c4fbcaa7ed0a@spud/ [3] https://lore.kernel.org/linux-riscv/20240305-fled-undrilled-41dc0c46bb29@spud/ [4] https://lore.kernel.org/linux-riscv/20240305-stress-earflap-d7ddb8655a4d@spud/ Signed-off-by: Yangyu Chen <cyy@cyyself.name> Acked-by: Guo Ren <guoren@kernel.org> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
1 parent ef10bdf commit 915fb0e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/soc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ obj-y += apple/
77
obj-y += aspeed/
88
obj-$(CONFIG_ARCH_AT91) += atmel/
99
obj-y += bcm/
10-
obj-$(CONFIG_SOC_CANAAN) += canaan/
10+
obj-$(CONFIG_ARCH_CANAAN) += canaan/
1111
obj-$(CONFIG_ARCH_DOVE) += dove/
1212
obj-$(CONFIG_MACH_DOVE) += dove/
1313
obj-y += fsl/

drivers/soc/canaan/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
config SOC_K210_SYSCTL
44
bool "Canaan Kendryte K210 SoC system controller"
5-
depends on RISCV && SOC_CANAAN && OF
5+
depends on RISCV && SOC_CANAAN_K210 && OF
66
depends on COMMON_CLK_K210
7-
default SOC_CANAAN
7+
default SOC_CANAAN_K210
88
select PM
99
select MFD_SYSCON
1010
help

0 commit comments

Comments
 (0)