diff mbox series

[RFC,24/27] soc: k210: convert SOC_CANAAN to ARCH_CANAAN

Message ID	20220923185605.1900083-25-conor@kernel.org (mailing list archive)
State	RFC, archived
Headers	show Return-Path: <linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org> From: Conor Dooley <conor@kernel.org> To: linux-riscv@lists.infradead.org Cc: palmer@dabbelt.com, damien.lemoal@opensource.wdc.com, geert@linux-mk68.org, heiko@sntech.de, kernel@esmil.dk, arnd@arndb.de, Conor Dooley <conor.dooley@microchip.com> Subject: [RFC 24/27] soc: k210: convert SOC_CANAAN to ARCH_CANAAN Date: Fri, 23 Sep 2022 19:56:03 +0100 Message-Id: <20220923185605.1900083-25-conor@kernel.org> In-Reply-To: <20220923185605.1900083-1-conor@kernel.org> References: <20220923185605.1900083-1-conor@kernel.org> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" <linux-riscv-bounces@lists.infradead.org> Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org
Series	RISC-V: Convert SOC_FOO symbols to ARCH_FOO \| expand [RFC,00/27] RISC-V: Convert SOC_FOO symbols to ARCH_FOO [RFC,01/27] clk: microchip: replace SOC_MICROCHIP_POLARFIRE with ARCH_MICROCHIP [RFC,02/27] i2c: microchip-corei2c: replace SOC_MICROCHIP_POLARFIRE with ARCH_MICROCHIP [RFC,03/27] mailbox: mpfs: replace SOC_MICROCHIP_POLARFIRE with ARCH_MICROCHIP [RFC,04/27] usb: musb: mpfs: replace SOC_MICROCHIP_POLARFIRE with ARCH_MICROCHIP [RFC,05/27] rtc: mpfs: replace SOC_MICROCHIP_POLARFIRE with ARCH_MICROCHIP [RFC,06/27] riscv: stop selecting the PolarFire SoC clock driver [RFC,07/27] riscv: replace SOC_STARFIVE with ARCH_STARFIVE [RFC,08/27] clk: starfive: replace SOC_STARFIVE with ARCH_STARFIVE [RFC,09/27] pinctrl: starfive: replace SOC_STARFIVE with ARCH_STARFIVE [RFC,10/27] reset: starfive: replace SOC_STARFIVE with ARCH_STARFIVE [RFC,11/27] riscv: replace SOC_SIFIVE with ARCH_SIFIVE [RFC,12/27] soc: sifive: convert SOC_SIFIVE to ARCH_SIFIVE [RFC,13/27] clk: sifive: convert SOC_SIFIVE to ARCH_SIFIVE [RFC,14/27] clk: sifive: select by default if ARCH_SIFIVE [RFC,15/27] serial: sifive: select by default if ARCH_SIFIVE [RFC,16/27] PCI: dwc: fu740: convert SOC_SIFIVE to ARCH_SIFIVE [RFC,17/27] riscv: stop selecting SiFive clock and serial drivers directly [RFC,18/27] riscv: convert SOC_VIRT to ARCH_VIRT [RFC,19/27] kunit: tool: rename SOC_VIRT to ARCH_VIRT in riscv's QEMU config [RFC,20/27] wireguard: selftests: swap SOC_VIRT for ARCH_VIRT on riscv [RFC,21/27] riscv: convert SOC_CANAAN to ARCH_CANAAN [RFC,22/27] clk: k210: convert SOC_CANAAN to ARCH_CANAAN [RFC,23/27] pinctrl: k210: convert SOC_CANAAN to ARCH_CANAAN [RFC,24/27] soc: k210: convert SOC_CANAAN to ARCH_CANAAN [RFC,25/27] reset: k210: convert SOC_CANAAN to ARCH_CANAAN [RFC,26/27] serial: sifive: select by default if ARCH_CANAAN [RFC,27/27] riscv: stop directly selecting drivers for ARCH_CANAAN

Commit Message

Conor Dooley Sept. 23, 2022, 6:56 p.m. UTC

From: Conor Dooley <conor.dooley@microchip.com>

As per the discussions at LPC, the SOC_ symbols in Kconfig.socs are to
be converted to ARCH_ for consistency between "incumbent" and incoming
vendors who have a legacy in other architectures.

Convert the SOC_CANAAN dependancy to ARCH_CANAAN. Since ARCH_CANAAN is
only defined on RISC-V, the Kconfig dependancy on RISCV can be dropped.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 drivers/soc/Makefile       | 2 +-
 drivers/soc/canaan/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile
index 534669840858..2a3504c9d21f 100644
--- a/drivers/soc/Makefile
+++ b/drivers/soc/Makefile
@@ -8,7 +8,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/
diff --git a/drivers/soc/canaan/Kconfig b/drivers/soc/canaan/Kconfig
index 2527cf5757ec..cdeade6040b4 100644
--- a/drivers/soc/canaan/Kconfig
+++ b/drivers/soc/canaan/Kconfig
@@ -2,8 +2,8 @@ 
 
 config SOC_K210_SYSCTL
 	bool "Canaan Kendryte K210 SoC system controller"
-	depends on RISCV && SOC_CANAAN && OF
-	default SOC_CANAAN
+	depends on ARCH_CANAAN && OF
+	default ARCH_CANAAN
         select PM
         select MFD_SYSCON
 	help