[PATCH v1 0/4] Convert SiFive drivers from SOC_FOO dependencies to ARCH_FOO

[PATCH v1 0/4] Convert SiFive drivers from SOC_FOO dependencies to ARCH_FOO

[Conor Dooley]

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

RISC-V's SOC_FOO symbols for micro-archs are going away, and being
replaced with the more common ARCH_FOO pattern that is used by other
archs (and by vendors with a history outside of RISC-V).
I kicked the conversion off by converting the Microchip RISC-V bits to
use their replacement symbol, so here's round two: the various SiFive
drivers.

There are no dependencies here, everything can go via subsystem trees.
We've already added the replacement symbols to RISC-V's Kconfig bits.

Cheers,
Conor.

CC: Michael Turquette <mturquette@baylibre.com>
CC: Stephen Boyd <sboyd@kernel.org>
CC: Palmer Dabbelt <palmer@dabbelt.com>
CC: Paul Walmsley <paul.walmsley@sifive.com>
CC: Lorenzo Pieralisi <lpieralisi@kernel.org>
CC: Krzysztof Wilczyński <kw@linux.com>
CC: Rob Herring <robh@kernel.org>
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Conor Dooley <conor@kernel.org>
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Jiri Slaby <jirislaby@kernel.org>
CC: linux-clk@vger.kernel.org
CC: linux-riscv@lists.infradead.org
CC: linux-kernel@vger.kernel.org
CC: linux-pci@vger.kernel.org
CC: linux-serial@vger.kernel.org

Conor Dooley (4):
  clk: sifive: make SiFive clk drivers depend on ARCH_ symbols
  PCI: dwc: make SiFive's PCI driver depend on ARCH_ symbols
  soc: sifive: make SiFive's cache controller driver depend on ARCH_
    symbols
  serial: make SiFive serial drivers depend on ARCH_ symbols

 drivers/clk/sifive/Kconfig         | 6 +++---
 drivers/pci/controller/dwc/Kconfig | 2 +-
 drivers/soc/sifive/Kconfig         | 2 +-
 drivers/tty/serial/Kconfig         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

-- 
2.39.2

[PATCH v1 1/4] clk: sifive: make SiFive clk drivers depend on ARCH_ symbols

[Conor Dooley]

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

As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the SiFive clk
drivers to use the new symbol.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 drivers/clk/sifive/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/sifive/Kconfig b/drivers/clk/sifive/Kconfig
index b7fde0aadfcb..2322f634a910 100644
--- a/drivers/clk/sifive/Kconfig
+++ b/drivers/clk/sifive/Kconfig
@@ -2,8 +2,8 @@
 
 menuconfig CLK_SIFIVE
 	bool "SiFive SoC driver support"
-	depends on SOC_SIFIVE || COMPILE_TEST
-	default SOC_SIFIVE
+	depends on ARCH_SIFIVE || COMPILE_TEST
+	default ARCH_SIFIVE
 	help
 	  SoC drivers for SiFive Linux-capable SoCs.
 
@@ -11,7 +11,7 @@ if CLK_SIFIVE
 
 config CLK_SIFIVE_PRCI
 	bool "PRCI driver for SiFive SoCs"
-	default SOC_SIFIVE
+	default ARCH_SIFIVE
 	select RESET_CONTROLLER
 	select RESET_SIMPLE
 	select CLK_ANALOGBITS_WRPLL_CLN28HPC
-- 
2.39.2

[PATCH v1 2/4] PCI: dwc: make SiFive's PCI driver depend on ARCH_ symbols

[Conor Dooley]

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

As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the dependency on
SOC_SIFIVE to the new symbol.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 drivers/pci/controller/dwc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index d29551261e80..7d670be44073 100644
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -409,7 +409,7 @@ config PCIE_AL
 config PCIE_FU740
 	bool "SiFive FU740 PCIe host controller"
 	depends on PCI_MSI
-	depends on SOC_SIFIVE || COMPILE_TEST
+	depends on ARCH_SIFIVE || COMPILE_TEST
 	select PCIE_DW_HOST
 	help
 	  Say Y here if you want PCIe controller support for the SiFive
-- 
2.39.2

[PATCH v1 3/4] soc: sifive: make SiFive's cache controller driver depend on ARCH_ symbols

[Conor Dooley]

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

As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the SiFive soc
drivers to use the new ARCH_FOO symbols.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
 drivers/soc/sifive/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/soc/sifive/Kconfig b/drivers/soc/sifive/Kconfig
index e86870be34c9..139884addc41 100644
--- a/drivers/soc/sifive/Kconfig
+++ b/drivers/soc/sifive/Kconfig
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
-if SOC_SIFIVE || SOC_STARFIVE
+if ARCH_SIFIVE || ARCH_STARFIVE
 
 config SIFIVE_CCACHE
 	bool "Sifive Composable Cache controller"
-- 
2.39.2

[PATCH v1 4/4] serial: make SiFive serial drivers depend on ARCH_ symbols

[Conor Dooley]

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

As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the SiFive serial
driver Kconfig entries from the SOC_ symbols to ARCH_ instead.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
I hope you like the message-id Greg ;)
---
 drivers/tty/serial/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 39a0078f54f6..398e5aac2e77 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -951,7 +951,7 @@ config SERIAL_OMAP_CONSOLE
 config SERIAL_SIFIVE
 	tristate "SiFive UART support"
 	depends on OF
-	default SOC_SIFIVE || SOC_CANAAN
+	default ARCH_SIFIVE || ARCH_CANAAN
 	select SERIAL_CORE
 	help
 	  Select this option if you are building a kernel for a device that
@@ -961,7 +961,7 @@ config SERIAL_SIFIVE
 config SERIAL_SIFIVE_CONSOLE
 	bool "Console on SiFive UART"
 	depends on SERIAL_SIFIVE=y
-	default SOC_SIFIVE || SOC_CANAAN
+	default ARCH_SIFIVE || ARCH_CANAAN
 	select SERIAL_CORE_CONSOLE
 	select SERIAL_EARLYCON
 	help
-- 
2.39.2

Re: [PATCH v1 0/4] Convert SiFive drivers from SOC_FOO dependencies to ARCH_FOO

[Christoph Hellwig]

On Thu, Apr 06, 2023 at 09:57:46PM +0100, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> RISC-V's SOC_FOO symbols for micro-archs are going away, and being
> replaced with the more common ARCH_FOO pattern that is used by other
> archs (and by vendors with a history outside of RISC-V).

And this is still the wrong way around.  This ARCH_ madness must not
spread.  NAK.

Re: [PATCH v1 0/4] Convert SiFive drivers from SOC_FOO dependencies to ARCH_FOO

[Conor Dooley]

On 8 April 2023 06:47:59 IST, Christoph Hellwig <hch@infradead.org> wrote:
>On Thu, Apr 06, 2023 at 09:57:46PM +0100, Conor Dooley wrote:
>> From: Conor Dooley <conor.dooley@microchip.com>
>> 
>> RISC-V's SOC_FOO symbols for micro-archs are going away, and being
>> replaced with the more common ARCH_FOO pattern that is used by other
>> archs (and by vendors with a history outside of RISC-V).
>
>And this is still the wrong way around.  This ARCH_ madness must not
>spread.  NAK.

As I said when you complained last, we asked the arm lads and there was no interest there in doing things differently & that's just one architecture.
Nor was there in adding a SOC_ symbol from some of the people who do more than one ISA.

You're welcome to send reverts for my first round of conversions and patches converting all the ARCH_ stuff RISC-V has to SOC_.
I'll happily ack a complete conversion to SOC_.
I don't care if it is arch or soc, I just want things to be used consistently.

Re: [PATCH v1 1/4] clk: sifive: make SiFive clk drivers depend on ARCH_ symbols

[Stephen Boyd]

Quoting Conor Dooley (2023-04-06 13:57:47)
> From: Conor Dooley <conor.dooley@microchip.com>
> 
> As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
> use of such symbols on other architectures, convert the SiFive clk
> drivers to use the new symbol.
> 
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---

Applied to clk-next

Re: [PATCH v1 3/4] soc: sifive: make SiFive's cache controller driver depend on ARCH_ symbols

[Palmer Dabbelt]

On Thu, 06 Apr 2023 13:57:49 PDT (-0700), Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
>
> As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
> use of such symbols on other architectures, convert the SiFive soc
> drivers to use the new ARCH_FOO symbols.
>
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
>  drivers/soc/sifive/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/soc/sifive/Kconfig b/drivers/soc/sifive/Kconfig
> index e86870be34c9..139884addc41 100644
> --- a/drivers/soc/sifive/Kconfig
> +++ b/drivers/soc/sifive/Kconfig
> @@ -1,6 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>
> -if SOC_SIFIVE || SOC_STARFIVE
> +if ARCH_SIFIVE || ARCH_STARFIVE
>
>  config SIFIVE_CCACHE
>  	bool "Sifive Composable Cache controller"

Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>