mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 04:02:20 +00:00
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>
This commit is contained in:
parent
ef10bdf9c3
commit
915fb0e31c
@ -7,7 +7,7 @@ obj-y += apple/
|
||||
obj-y += aspeed/
|
||||
obj-$(CONFIG_ARCH_AT91) += atmel/
|
||||
obj-y += bcm/
|
||||
obj-$(CONFIG_SOC_CANAAN) += canaan/
|
||||
obj-$(CONFIG_ARCH_CANAAN) += canaan/
|
||||
obj-$(CONFIG_ARCH_DOVE) += dove/
|
||||
obj-$(CONFIG_MACH_DOVE) += dove/
|
||||
obj-y += fsl/
|
||||
|
@ -2,9 +2,9 @@
|
||||
|
||||
config SOC_K210_SYSCTL
|
||||
bool "Canaan Kendryte K210 SoC system controller"
|
||||
depends on RISCV && SOC_CANAAN && OF
|
||||
depends on RISCV && SOC_CANAAN_K210 && OF
|
||||
depends on COMMON_CLK_K210
|
||||
default SOC_CANAAN
|
||||
default SOC_CANAAN_K210
|
||||
select PM
|
||||
select MFD_SYSCON
|
||||
help
|
||||
|
Loading…
Reference in New Issue
Block a user