Commit 7bb49d77 authored by William Zhang's avatar William Zhang Committed by Florian Fainelli

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: default avatarWilliam 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.comSigned-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 751c3e19
...@@ -488,8 +488,8 @@ config I2C_BCM_KONA ...@@ -488,8 +488,8 @@ config I2C_BCM_KONA
config I2C_BRCMSTB config I2C_BRCMSTB
tristate "BRCM Settop/DSL I2C controller" tristate "BRCM Settop/DSL I2C controller"
depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \ depends on ARCH_BCM2835 || ARCH_BCMBCA || ARCH_BRCMSTB || \
ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST BMIPS_GENERIC || COMPILE_TEST
default y default y
help help
If you say yes to this option, support will be included for the If you say yes to this option, support will be included for the
......
...@@ -69,8 +69,8 @@ config MTD_OF_PARTS ...@@ -69,8 +69,8 @@ config MTD_OF_PARTS
config MTD_OF_PARTS_BCM4908 config MTD_OF_PARTS_BCM4908
bool "BCM4908 partitioning support" bool "BCM4908 partitioning support"
depends on MTD_OF_PARTS && (ARCH_BCM4908 || COMPILE_TEST) depends on MTD_OF_PARTS && (ARCH_BCMBCA || COMPILE_TEST)
default ARCH_BCM4908 default ARCH_BCMBCA
help help
This provides partitions parser for BCM4908 family devices This provides partitions parser for BCM4908 family devices
that can have multiple "firmware" partitions. It takes care of that can have multiple "firmware" partitions. It takes care of
...@@ -78,7 +78,7 @@ config MTD_OF_PARTS_BCM4908 ...@@ -78,7 +78,7 @@ config MTD_OF_PARTS_BCM4908
config MTD_OF_PARTS_LINKSYS_NS config MTD_OF_PARTS_LINKSYS_NS
bool "Linksys Northstar partitioning support" 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 default ARCH_BCM_5301X
help help
This provides partitions parser for Linksys devices based on Broadcom This provides partitions parser for Linksys devices based on Broadcom
......
...@@ -53,8 +53,8 @@ config B44_PCI ...@@ -53,8 +53,8 @@ config B44_PCI
config BCM4908_ENET config BCM4908_ENET
tristate "Broadcom BCM4908 internal mac support" tristate "Broadcom BCM4908 internal mac support"
depends on ARCH_BCM4908 || COMPILE_TEST depends on ARCH_BCMBCA || COMPILE_TEST
default y if ARCH_BCM4908 default y if ARCH_BCMBCA
help help
This driver supports Ethernet controller integrated into Broadcom This driver supports Ethernet controller integrated into Broadcom
BCM4908 family SoCs. BCM4908 family SoCs.
......
...@@ -274,7 +274,7 @@ config VMD ...@@ -274,7 +274,7 @@ config VMD
config PCIE_BRCMSTB config PCIE_BRCMSTB
tristate "Broadcom Brcmstb PCIe host controller" 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 BMIPS_GENERIC || COMPILE_TEST
depends on OF depends on OF
depends on PCI_MSI_IRQ_DOMAIN depends on PCI_MSI_IRQ_DOMAIN
......
...@@ -93,11 +93,11 @@ config PHY_BRCM_SATA ...@@ -93,11 +93,11 @@ config PHY_BRCM_SATA
config PHY_BRCM_USB config PHY_BRCM_USB
tristate "Broadcom STB USB PHY driver" 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 depends on OF
select GENERIC_PHY select GENERIC_PHY
select SOC_BRCMSTB if ARCH_BRCMSTB select SOC_BRCMSTB if ARCH_BRCMSTB
default ARCH_BCM4908 || ARCH_BRCMSTB default ARCH_BCMBCA || ARCH_BRCMSTB
help help
Enable this to support the Broadcom STB USB PHY. Enable this to support the Broadcom STB USB PHY.
This driver is required by the USB XHCI, EHCI and OHCI This driver is required by the USB XHCI, EHCI and OHCI
......
...@@ -31,13 +31,13 @@ config PINCTRL_BCM2835 ...@@ -31,13 +31,13 @@ config PINCTRL_BCM2835
config PINCTRL_BCM4908 config PINCTRL_BCM4908
tristate "Broadcom BCM4908 pinmux driver" tristate "Broadcom BCM4908 pinmux driver"
depends on OF && (ARCH_BCM4908 || COMPILE_TEST) depends on OF && (ARCH_BCMBCA || COMPILE_TEST)
select PINMUX select PINMUX
select PINCONF select PINCONF
select GENERIC_PINCONF select GENERIC_PINCONF
select GENERIC_PINCTRL_GROUPS select GENERIC_PINCTRL_GROUPS
select GENERIC_PINMUX_FUNCTIONS select GENERIC_PINMUX_FUNCTIONS
default ARCH_BCM4908 default ARCH_BCMBCA
help help
Driver for BCM4908 family SoCs with integrated pin controller. Driver for BCM4908 family SoCs with integrated pin controller.
......
...@@ -201,7 +201,7 @@ config RESET_SCMI ...@@ -201,7 +201,7 @@ config RESET_SCMI
config RESET_SIMPLE config RESET_SIMPLE
bool "Simple Reset Controller Driver" if COMPILE_TEST || EXPERT 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 depends on HAS_IOMEM
help help
This enables a simple reset controller driver for reset lines that This enables a simple reset controller driver for reset lines that
......
...@@ -13,8 +13,8 @@ endif # SOC_BCM63XX ...@@ -13,8 +13,8 @@ endif # SOC_BCM63XX
config BCM_PMB config BCM_PMB
bool "Broadcom PMB (Power Management Bus) driver" bool "Broadcom PMB (Power Management Bus) driver"
depends on ARCH_BCM4908 || (COMPILE_TEST && OF) depends on ARCH_BCMBCA || (COMPILE_TEST && OF)
default ARCH_BCM4908 default ARCH_BCMBCA
select PM_GENERIC_DOMAINS if PM select PM_GENERIC_DOMAINS if PM
help help
This enables support for the Broadcom's PMB (Power Management Bus) that This enables support for the Broadcom's PMB (Power Management Bus) that
......
...@@ -1083,8 +1083,8 @@ config SERIAL_TIMBERDALE ...@@ -1083,8 +1083,8 @@ config SERIAL_TIMBERDALE
config SERIAL_BCM63XX config SERIAL_BCM63XX
tristate "Broadcom BCM63xx/BCM33xx UART support" tristate "Broadcom BCM63xx/BCM33xx UART support"
select SERIAL_CORE select SERIAL_CORE
depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST depends on ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC default ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
help help
This enables the driver for the onchip UART core found on This enables the driver for the onchip UART core found on
the following chipsets: the following chipsets:
......
...@@ -1799,7 +1799,7 @@ config BCM7038_WDT ...@@ -1799,7 +1799,7 @@ config BCM7038_WDT
tristate "BCM63xx/BCM7038 Watchdog" tristate "BCM63xx/BCM7038 Watchdog"
select WATCHDOG_CORE select WATCHDOG_CORE
depends on HAS_IOMEM 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 help
Watchdog driver for the built-in hardware in Broadcom 7038 and Watchdog driver for the built-in hardware in Broadcom 7038 and
later SoCs used in set-top boxes. BCM7038 was made public later SoCs used in set-top boxes. BCM7038 was made public
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment