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

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.com


Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 751c3e19

drivers/i2c/busses/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -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

drivers/mtd/parsers/Kconfig

+3 −3
Original line number Original line Diff line number Diff line
@@ -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 




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

drivers/net/ethernet/broadcom/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -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.

drivers/pci/controller/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

drivers/phy/broadcom/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -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