From: Conor Dooley <[email protected]>
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).
Kick the conversion off by converting the Microchip RISC-V bits to use
their replacement symbol
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 <[email protected]>
CC: Stephen Boyd <[email protected]>
CC: Claudiu Beznea <[email protected]>
CC: [email protected]
CC: Jassi Brar <[email protected]>
CC: [email protected]
CC: Alessandro Zummo <[email protected]>
CC: Alexandre Belloni <[email protected]>
CC: [email protected]
CC: Bin Liu <[email protected]>
CC: Greg Kroah-Hartman <[email protected]>
CC: [email protected]
CC: Wolfram Sang <[email protected]>
CC: [email protected]
CC: Daire McNamara <[email protected]>
Conor Dooley (5):
clk: microchip: convert SOC_MICROCHIP_POLARFIRE to
ARCH_MICROCHIP_POLARFIRE
i2c: microchip-core: convert SOC_MICROCHIP_POLARFIRE to
ARCH_MICROCHIP_POLARFIRE
mailbox: mpfs: convert SOC_MICROCHIP_POLARFIRE to
ARCH_MICROCHIP_POLARFIRE
rtc: mpfs: convert SOC_MICROCHIP_POLARFIRE to ARCH_MICROCHIP_POLARFIRE
usb: musb: mpfs: convert SOC_MICROCHIP_POLARFIRE to
ARCH_MICROCHIP_POLARFIRE
drivers/clk/microchip/Kconfig | 4 ++--
drivers/i2c/busses/Kconfig | 2 +-
drivers/mailbox/Kconfig | 2 +-
drivers/rtc/Kconfig | 2 +-
drivers/usb/musb/Kconfig | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
--
2.39.2
From: Conor Dooley <[email protected]>
As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the Microchip FPGA
clock drivers to use the new symbol.
Signed-off-by: Conor Dooley <[email protected]>
---
drivers/clk/microchip/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/microchip/Kconfig b/drivers/clk/microchip/Kconfig
index e33e51978938..0724ce65898f 100644
--- a/drivers/clk/microchip/Kconfig
+++ b/drivers/clk/microchip/Kconfig
@@ -5,8 +5,8 @@ config COMMON_CLK_PIC32
config MCHP_CLK_MPFS
bool "Clk driver for PolarFire SoC"
- depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST
- default SOC_MICROCHIP_POLARFIRE
+ depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
+ default ARCH_MICROCHIP_POLARFIRE
select AUXILIARY_BUS
help
Supports Clock Configuration for PolarFire SoC
--
2.39.2
From: Conor Dooley <[email protected]>
As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the Microchip FPGA
i2c drivers to use the new symbol.
Signed-off-by: Conor Dooley <[email protected]>
---
drivers/i2c/busses/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 25eb4e8fd22f..9fa4a7bb5c8b 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -804,7 +804,7 @@ config I2C_MESON
config I2C_MICROCHIP_CORE
tristate "Microchip FPGA I2C controller"
- depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST
+ depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
depends on OF
help
If you say yes to this option, support will be included for the
--
2.39.2
From: Conor Dooley <[email protected]>
As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the Microchip FPGA
usb glue layer driver to use the new symbol.
Signed-off-by: Conor Dooley <[email protected]>
---
drivers/usb/musb/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 3a1f4bcea80c..9a8cf3de0617 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -113,7 +113,7 @@ config USB_MUSB_MEDIATEK
config USB_MUSB_POLARFIRE_SOC
tristate "Microchip PolarFire SoC platforms"
- depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST
+ depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
depends on NOP_USB_XCEIV
select USB_MUSB_DUAL_ROLE
help
--
2.39.2
From: Conor Dooley <[email protected]>
As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the Microchip FPGA
RTC driver to use the new symbol.
Signed-off-by: Conor Dooley <[email protected]>
---
drivers/rtc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 5a71579af0a1..753872408615 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1970,7 +1970,7 @@ config RTC_DRV_MSC313
config RTC_DRV_POLARFIRE_SOC
tristate "Microchip PolarFire SoC built-in RTC"
- depends on SOC_MICROCHIP_POLARFIRE
+ depends on ARCH_MICROCHIP_POLARFIRE
help
If you say yes here you will get support for the
built-in RTC on Polarfire SoC.
--
2.39.2
From: Conor Dooley <[email protected]>
As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
use of such symbols on other architectures, convert the Microchip FPGA
mailbox driver to use the new symbol.
Signed-off-by: Conor Dooley <[email protected]>
---
drivers/mailbox/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index 1495965bc394..3f97d5535267 100644
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -176,7 +176,7 @@ config MAILBOX_TEST
config POLARFIRE_SOC_MAILBOX
tristate "PolarFire SoC (MPFS) Mailbox"
depends on HAS_IOMEM
- depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST
+ depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
help
This driver adds support for the PolarFire SoC (MPFS) mailbox controller.
--
2.39.2
On 09.03.2023 22:44, Conor Dooley wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> From: Conor Dooley <[email protected]>
>
> As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
> use of such symbols on other architectures, convert the Microchip FPGA
> clock drivers to use the new symbol.
>
> Signed-off-by: Conor Dooley <[email protected]>
Applied to clk-microchip, thanks!
On Thu, Mar 09, 2023 at 08:44:49PM +0000, Conor Dooley wrote:
> From: Conor Dooley <[email protected]>
>
> As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
> use of such symbols on other architectures, convert the Microchip FPGA
> i2c drivers to use the new symbol.
>
> Signed-off-by: Conor Dooley <[email protected]>
Applied to for-next, thanks!
On Thu, 09 Mar 2023 20:44:51 +0000, Conor Dooley wrote:
> As part of converting RISC-V SOC_FOO symbols to ARCH_FOO to match the
> use of such symbols on other architectures, convert the Microchip FPGA
> RTC driver to use the new symbol.
>
>
Applied, thanks!
[4/5] rtc: mpfs: convert SOC_MICROCHIP_POLARFIRE to ARCH_MICROCHIP_POLARFIRE
commit: f12f0c7da37c58da92bd4a6bdc469df7e0b2da5e
Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com