jh71x0: update patches and config

[openwrt/staging/wigyori.git] / target / linux / jh71x0 / patches-6.1 / 0056-generic-6.1-change-ARCH_STARFIVE-to-SOC_STARFIVE.patch

diff --git a/target/linux/jh71x0/patches-6.1/0056-generic-6.1-change-ARCH_STARFIVE-to-SOC_STARFIVE.patch b/target/linux/jh71x0/patches-6.1/0056-generic-6.1-change-ARCH_STARFIVE-to-SOC_STARFIVE.patch
deleted file mode 100644 (file)
index 226ff0e..0000000
--- a/target/linux/jh71x0/patches-6.1/0056-generic-6.1-change-ARCH_STARFIVE-to-SOC_STARFIVE.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 520841348b93c0913cdefa5abf46fde033d1d57b Mon Sep 17 00:00:00 2001
-From: Zoltan HERPAI <wigyori@uid0.hu>
-Date: Sun, 28 May 2023 18:22:32 +0200
-Subject: [PATCH 56/95] generic/6.1: change ARCH_STARFIVE to SOC_STARFIVE
-
-Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
----
- drivers/clk/starfive/Kconfig                | 12 ++++++------
- drivers/net/ethernet/stmicro/stmmac/Kconfig |  4 ++--
- drivers/reset/starfive/Kconfig              |  6 +++---
- drivers/watchdog/Kconfig                    |  4 ++--
- 4 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig
-index 71c1148ee5f6..78305ae54c0e 100644
---- a/drivers/clk/starfive/Kconfig
-+++ b/drivers/clk/starfive/Kconfig
-@@ -5,9 +5,9 @@ config CLK_STARFIVE_JH71X0
- 
- config CLK_STARFIVE_JH7100
-       bool "StarFive JH7100 clock support"
--      depends on ARCH_STARFIVE || COMPILE_TEST
-+      depends on SOC_STARFIVE || COMPILE_TEST
-       select CLK_STARFIVE_JH71X0
--      default ARCH_STARFIVE
-+      default SOC_STARFIVE
-       help
-         Say yes here to support the clock controller on the StarFive JH7100
-         SoC.
-@@ -16,18 +16,18 @@ config CLK_STARFIVE_JH7100_AUDIO
-       tristate "StarFive JH7100 audio clock support"
-       depends on CLK_STARFIVE_JH7100
-       select CLK_STARFIVE_JH71X0
--      default m if ARCH_STARFIVE
-+      default m if SOC_STARFIVE
-       help
-         Say Y or M here to support the audio clocks on the StarFive JH7100
-         SoC.
- 
- config CLK_STARFIVE_JH7110_SYS
-       bool "StarFive JH7110 system clock support"
--      depends on ARCH_STARFIVE || COMPILE_TEST
-+      depends on SOC_STARFIVE || COMPILE_TEST
-       select AUXILIARY_BUS
-       select CLK_STARFIVE_JH71X0
-       select RESET_STARFIVE_JH7110
--      default ARCH_STARFIVE
-+      default SOC_STARFIVE
-       help
-         Say yes here to support the system clock controller on the
-         StarFive JH7110 SoC.
-@@ -38,7 +38,7 @@ config CLK_STARFIVE_JH7110_AON
-       select AUXILIARY_BUS
-       select CLK_STARFIVE_JH71X0
-       select RESET_STARFIVE_JH7110
--      default m if ARCH_STARFIVE
-+      default m if SOC_STARFIVE
-       help
-         Say yes here to support the always-on clock controller on the
-         StarFive JH7110 SoC.
-diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
-index b5e95e6fc4a4..71bb4d515a19 100644
---- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
-+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
-@@ -167,9 +167,9 @@ config DWMAC_SOCFPGA
- 
- config DWMAC_STARFIVE
-       tristate "StarFive dwmac support"
--      depends on OF && (ARCH_STARFIVE || COMPILE_TEST)
-+      depends on OF && (SOC_STARFIVE || COMPILE_TEST)
-       select MFD_SYSCON
--      default m if ARCH_STARFIVE
-+      default m if SOC_STARFIVE
-       help
-         Support for ethernet controllers on StarFive RISC-V SoCs
- 
-diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig
-index 1fa706a2c3dc..c2bb0a7d38b5 100644
---- a/drivers/reset/starfive/Kconfig
-+++ b/drivers/reset/starfive/Kconfig
-@@ -5,9 +5,9 @@ config RESET_STARFIVE_JH71X0
- 
- config RESET_STARFIVE_JH7100
-       bool "StarFive JH7100 Reset Driver"
--      depends on ARCH_STARFIVE || COMPILE_TEST
-+      depends on SOC_STARFIVE || COMPILE_TEST
-       select RESET_STARFIVE_JH71X0
--      default ARCH_STARFIVE
-+      default SOC_STARFIVE
-       help
-         This enables the reset controller driver for the StarFive JH7100 SoC.
- 
-@@ -15,6 +15,6 @@ config RESET_STARFIVE_JH7110
-       bool "StarFive JH7110 Reset Driver"
-       depends on AUXILIARY_BUS && CLK_STARFIVE_JH7110_SYS
-       select RESET_STARFIVE_JH71X0
--      default ARCH_STARFIVE
-+      default SOC_STARFIVE
-       help
-         This enables the reset controller driver for the StarFive JH7110 SoC.
-diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
-index 44e0670a76f6..044a8bd060c5 100644
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -1995,9 +1995,9 @@ config WATCHDOG_RTAS
- 
- config STARFIVE_WATCHDOG
-       tristate "StarFive Watchdog support"
--      depends on ARCH_STARFIVE || COMPILE_TEST
-+      depends on SOC_STARFIVE || COMPILE_TEST
-       select WATCHDOG_CORE
--      default ARCH_STARFIVE
-+      default SOC_STARFIVE
-       help
-         Say Y here to support the watchdog of StarFive JH7100 and JH7110
-         SoC. This driver can also be built as a module if choose M.
--- 
-2.20.1
-