tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

William Zhang and committed by
Florian Fainelli 7bb49d77 751c3e19

+18 -18
+2 -2
drivers/i2c/busses/Kconfig
··· 488 488 489 489 config I2C_BRCMSTB 490 490 tristate "BRCM Settop/DSL I2C controller" 491 - depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \ 492 - ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST 491 + depends on ARCH_BCM2835 || ARCH_BCMBCA || ARCH_BRCMSTB || \ 492 + BMIPS_GENERIC || COMPILE_TEST 493 493 default y 494 494 help 495 495 If you say yes to this option, support will be included for the
+3 -3
drivers/mtd/parsers/Kconfig
··· 69 69 70 70 config MTD_OF_PARTS_BCM4908 71 71 bool "BCM4908 partitioning support" 72 - depends on MTD_OF_PARTS && (ARCH_BCM4908 || COMPILE_TEST) 73 - default ARCH_BCM4908 72 + depends on MTD_OF_PARTS && (ARCH_BCMBCA || COMPILE_TEST) 73 + default ARCH_BCMBCA 74 74 help 75 75 This provides partitions parser for BCM4908 family devices 76 76 that can have multiple "firmware" partitions. It takes care of ··· 78 78 79 79 config MTD_OF_PARTS_LINKSYS_NS 80 80 bool "Linksys Northstar partitioning support" 81 - depends on MTD_OF_PARTS && (ARCH_BCM_5301X || ARCH_BCM4908 || COMPILE_TEST) 81 + depends on MTD_OF_PARTS && (ARCH_BCM_5301X || ARCH_BCMBCA || COMPILE_TEST) 82 82 default ARCH_BCM_5301X 83 83 help 84 84 This provides partitions parser for Linksys devices based on Broadcom
+2 -2
drivers/net/ethernet/broadcom/Kconfig
··· 53 53 54 54 config BCM4908_ENET 55 55 tristate "Broadcom BCM4908 internal mac support" 56 - depends on ARCH_BCM4908 || COMPILE_TEST 57 - default y if ARCH_BCM4908 56 + depends on ARCH_BCMBCA || COMPILE_TEST 57 + default y if ARCH_BCMBCA 58 58 help 59 59 This driver supports Ethernet controller integrated into Broadcom 60 60 BCM4908 family SoCs.
+1 -1
drivers/pci/controller/Kconfig
··· 274 274 275 275 config PCIE_BRCMSTB 276 276 tristate "Broadcom Brcmstb PCIe host controller" 277 - depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCM4908 || \ 277 + depends on ARCH_BRCMSTB || ARCH_BCM2835 || ARCH_BCMBCA || \ 278 278 BMIPS_GENERIC || COMPILE_TEST 279 279 depends on OF 280 280 depends on PCI_MSI_IRQ_DOMAIN
+2 -2
drivers/phy/broadcom/Kconfig
··· 93 93 94 94 config PHY_BRCM_USB 95 95 tristate "Broadcom STB USB PHY driver" 96 - depends on ARCH_BCM4908 || ARCH_BRCMSTB || COMPILE_TEST 96 + depends on ARCH_BCMBCA || ARCH_BRCMSTB || COMPILE_TEST 97 97 depends on OF 98 98 select GENERIC_PHY 99 99 select SOC_BRCMSTB if ARCH_BRCMSTB 100 - default ARCH_BCM4908 || ARCH_BRCMSTB 100 + default ARCH_BCMBCA || ARCH_BRCMSTB 101 101 help 102 102 Enable this to support the Broadcom STB USB PHY. 103 103 This driver is required by the USB XHCI, EHCI and OHCI
+2 -2
drivers/pinctrl/bcm/Kconfig
··· 31 31 32 32 config PINCTRL_BCM4908 33 33 tristate "Broadcom BCM4908 pinmux driver" 34 - depends on OF && (ARCH_BCM4908 || COMPILE_TEST) 34 + depends on OF && (ARCH_BCMBCA || COMPILE_TEST) 35 35 select PINMUX 36 36 select PINCONF 37 37 select GENERIC_PINCONF 38 38 select GENERIC_PINCTRL_GROUPS 39 39 select GENERIC_PINMUX_FUNCTIONS 40 - default ARCH_BCM4908 40 + default ARCH_BCMBCA 41 41 help 42 42 Driver for BCM4908 family SoCs with integrated pin controller. 43 43
+1 -1
drivers/reset/Kconfig
··· 201 201 202 202 config RESET_SIMPLE 203 203 bool "Simple Reset Controller Driver" if COMPILE_TEST || EXPERT 204 - default ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || (ARCH_INTEL_SOCFPGA && ARM64) || ARCH_SUNXI || ARC 204 + default ARCH_ASPEED || ARCH_BCMBCA || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || (ARCH_INTEL_SOCFPGA && ARM64) || ARCH_SUNXI || ARC 205 205 depends on HAS_IOMEM 206 206 help 207 207 This enables a simple reset controller driver for reset lines that
+2 -2
drivers/soc/bcm/bcm63xx/Kconfig
··· 13 13 14 14 config BCM_PMB 15 15 bool "Broadcom PMB (Power Management Bus) driver" 16 - depends on ARCH_BCM4908 || (COMPILE_TEST && OF) 17 - default ARCH_BCM4908 16 + depends on ARCH_BCMBCA || (COMPILE_TEST && OF) 17 + default ARCH_BCMBCA 18 18 select PM_GENERIC_DOMAINS if PM 19 19 help 20 20 This enables support for the Broadcom's PMB (Power Management Bus) that
+2 -2
drivers/tty/serial/Kconfig
··· 1083 1083 config SERIAL_BCM63XX 1084 1084 tristate "Broadcom BCM63xx/BCM33xx UART support" 1085 1085 select SERIAL_CORE 1086 - depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST 1087 - default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC 1086 + depends on ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST 1087 + default ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC 1088 1088 help 1089 1089 This enables the driver for the onchip UART core found on 1090 1090 the following chipsets:
+1 -1
drivers/watchdog/Kconfig
··· 1799 1799 tristate "BCM63xx/BCM7038 Watchdog" 1800 1800 select WATCHDOG_CORE 1801 1801 depends on HAS_IOMEM 1802 - depends on ARCH_BCM4908 || ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST 1802 + depends on ARCH_BCMBCA || ARCH_BRCMSTB || BMIPS_GENERIC || BCM63XX || COMPILE_TEST 1803 1803 help 1804 1804 Watchdog driver for the built-in hardware in Broadcom 7038 and 1805 1805 later SoCs used in set-top boxes. BCM7038 was made public