arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA

With Broadcom Broadband arch ARCH_BCMBCA supported in the kernel, this
patch series migrate the ARCH_BCM4908 symbol to ARCH_BCMBCA. Hence
replace ARCH_BCM4908 with ARCH_BCMBCA in subsystem Kconfig files.

Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Guenter Roeck <linux@roeck-us.net> (for watchdog)
Acked-by: Bjorn Helgaas <bhelgaas@google.com> (for drivers/pci)
Acked-by: Wolfram Sang <wsa@kernel.org> (for i2c)
Acked-by: Philipp Zabel <p.zabel@pengutronix.de> (for reset)
Link: https://lore.kernel.org/r/20220803175455.47638-7-william.zhang@broadcom.com
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 7284206b278b9e84dc4be0ab81eb5d47d97eaeb0..0c48d8a9f44a3404bf42a55f090d31664a35a21e 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -488,8 +488,8 @@ config I2C_BCM_KONA
 
 config I2C_BRCMSTB
        tristate "BRCM Settop/DSL I2C controller"
-       depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
-                  ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
+       depends on ARCH_BCM2835 || ARCH_BCMBCA || ARCH_BRCMSTB || \
+                  BMIPS_GENERIC || COMPILE_TEST
        default y
        help
          If you say yes to this option, support will be included for the

diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig
index b43df73927a02ca23dc4f40271bcf2ed9e6e967d..d6db655a1d24fcecb7ecbe1d04e3e5d74878f232 100644 (file)
--- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig
@@ -69,8 +69,8 @@ config MTD_OF_PARTS
 
 config MTD_OF_PARTS_BCM4908
        bool "BCM4908 partitioning support"
-       depends on MTD_OF_PARTS && (ARCH_BCM4908 || COMPILE_TEST)
-       default ARCH_BCM4908
+       depends on MTD_OF_PARTS && (ARCH_BCMBCA || COMPILE_TEST)
+       default ARCH_BCMBCA
        help
          This provides partitions parser for BCM4908 family devices
          that can have multiple "firmware" partitions. It takes care of
@@ -78,7 +78,7 @@ config MTD_OF_PARTS_BCM4908
 
 config MTD_OF_PARTS_LINKSYS_NS
        bool "Linksys Northstar partitioning support"
-       depends on MTD_OF_PARTS && (ARCH_BCM_5301X || ARCH_BCM4908 || COMPILE_TEST)
+       depends on MTD_OF_PARTS && (ARCH_BCM_5301X || ARCH_BCMBCA || COMPILE_TEST)
        default ARCH_BCM_5301X
        help
          This provides partitions parser for Linksys devices based on Broadcom

diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 56e0fb07aec7fde44e11ff8c1b9e64ff8e13b83a..f4e1ca68d831002a250192e5839eb1f657e1b032 100644 (file)
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -53,8 +53,8 @@ config B44_PCI
 
 config BCM4908_ENET
        tristate "Broadcom BCM4908 internal mac support"
-       depends on ARCH_BCM4908 || COMPILE_TEST
-       default y if ARCH_BCM4908
+       depends on ARCH_BCMBCA || COMPILE_TEST
+       default y if ARCH_BCMBCA
        help
          This driver supports Ethernet controller integrated into Broadcom
          BCM4908 family SoCs.

diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
index d1c5fcf00a8a2b0834624434edcbb491df06fc89..bfd9bac37e24f14e628c9621054691b6b1bb41fe 100644 (file)
--- a/drivers/pci/controller/Kconfig
+++ b/drivers/pci/controller/Kconfig
@@ -274,7 +274,7 @@ config VMD
 
 config PCIE_BRCMSTB
        tristate "Broadcom Brcmstb PCIe host controller"
-       depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || \
+       depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCMBCA || \
                   BMIPS_GENERIC || COMPILE_TEST
        depends on OF
        depends on PCI_MSI_IRQ_DOMAIN

diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
index 93a6a8ee47167313251b3823a55aa67090e8bab5..1d89a2fd9b79b328ec5299fffaf97a12f6b34243 100644 (file)
--- a/drivers/phy/broadcom/Kconfig
+++ b/drivers/phy/broadcom/Kconfig
@@ -93,11 +93,11 @@ config PHY_BRCM_SATA
 
 config PHY_BRCM_USB
        tristate "Broadcom STB USB PHY driver"
-       depends on ARCH_BCM4908 || ARCH_BRCMSTB || COMPILE_TEST
+       depends on ARCH_BCMBCA || ARCH_BRCMSTB || COMPILE_TEST
        depends on OF
        select GENERIC_PHY
        select SOC_BRCMSTB if ARCH_BRCMSTB
-       default ARCH_BCM4908 || ARCH_BRCMSTB
+       default ARCH_BCMBCA || ARCH_BRCMSTB
        help
          Enable this to support the Broadcom STB USB PHY.
          This driver is required by the USB XHCI, EHCI and OHCI

diff --git a/drivers/pinctrl/bcm/Kconfig b/drivers/pinctrl/bcm/Kconfig
index 8f4d89806fcba4ea61a83c71817dc764826a1523..35b51ce4298e2588d0ae9dbda95749858e75dba8 100644 (file)
--- a/drivers/pinctrl/bcm/Kconfig
+++ b/drivers/pinctrl/bcm/Kconfig
@@ -31,13 +31,13 @@ config PINCTRL_BCM2835
 
 config PINCTRL_BCM4908
        tristate "Broadcom BCM4908 pinmux driver"
-       depends on OF && (ARCH_BCM4908 || COMPILE_TEST)
+       depends on OF && (ARCH_BCMBCA || COMPILE_TEST)
        select PINMUX
        select PINCONF
        select GENERIC_PINCONF
        select GENERIC_PINCTRL_GROUPS
        select GENERIC_PINMUX_FUNCTIONS
-       default ARCH_BCM4908
+       default ARCH_BCMBCA
        help
          Driver for BCM4908 family SoCs with integrated pin controller.
 

diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig
index 806773e88832180d9232b3e88f0a9dec90350656..2a8238eb8794f9b3b650ce9cfb2c81007705eaba 100644 (file)
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@ -201,7 +201,7 @@ config RESET_SCMI
 
 config RESET_SIMPLE
        bool "Simple Reset Controller Driver" if COMPILE_TEST || EXPERT
-       default ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || (ARCH_INTEL_SOCFPGA && ARM64) || ARCH_SUNXI || ARC
+       default ARCH_ASPEED || ARCH_BCMBCA || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || (ARCH_INTEL_SOCFPGA && ARM64) || ARCH_SUNXI || ARC
        depends on HAS_IOMEM
        help
          This enables a simple reset controller driver for reset lines that

diff --git a/drivers/soc/bcm/bcm63xx/Kconfig b/drivers/soc/bcm/bcm63xx/Kconfig
index 9e501c8ac5ce116cb524f8094de22ecdeeba15a6..355c34482076e18a1be43554fd8dd133db986287 100644 (file)
--- a/drivers/soc/bcm/bcm63xx/Kconfig
+++ b/drivers/soc/bcm/bcm63xx/Kconfig
@@ -13,8 +13,8 @@ endif # SOC_BCM63XX
 
 config BCM_PMB
        bool "Broadcom PMB (Power Management Bus) driver"
-       depends on ARCH_BCM4908 || (COMPILE_TEST && OF)
-       default ARCH_BCM4908
+       depends on ARCH_BCMBCA || (COMPILE_TEST && OF)
+       default ARCH_BCMBCA
        select PM_GENERIC_DOMAINS if PM
        help
          This enables support for the Broadcom's PMB (Power Management Bus) that

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 877173907c5369a58d48f563612164f251ee8de5..ba4b63fd511e849e94200a1f843d34ac90d1ca8c 100644 (file)
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1083,8 +1083,8 @@ config SERIAL_TIMBERDALE
 config SERIAL_BCM63XX
        tristate "Broadcom BCM63xx/BCM33xx UART support"
        select SERIAL_CORE
-       depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
-       default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
+       depends on ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+       default ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
        help
          This enables the driver for the onchip UART core found on
          the following chipsets:

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 9295492d24f74e52ad4642774fea57e7a7795fe2..688922fc4edb0738fa56adce109cf224a974a49c 100644 (file)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1799,7 +1799,7 @@ config BCM7038_WDT
        tristate "BCM63xx/BCM7038 Watchdog"
        select WATCHDOG_CORE
        depends on HAS_IOMEM
-       depends on ARCH_BCM4908 || ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST
+       depends on ARCH_BCMBCA || ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST
        help
          Watchdog driver for the built-in hardware in Broadcom 7038 and
          later SoCs used in set-top boxes.  BCM7038 was made public