Unverified Commit 34fdb46f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-6.1/drivers' of https://github.com/Broadcom/stblinux into arm/drivers 

This pull request contains Broadcom ARM/ARM64 SoC drivers updates for
6.1, please pull the following:

- Guilherme adds a comment to the panic notifier, part of his big panic
notifier rework series

- William migrates all of ARCH_BCM4908 dependencies to ARCH_BCMBCA

* tag 'arm-soc/for-6.1/drivers' of https://github.com/Broadcom/stblinux:
  arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA
  soc: bcm: brcmstb: Document panic notifier action and remove useless header

Link: https://lore.kernel.org/r/20220915023044.2350782-4-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d6ce6d14 7bb49d77

drivers/i2c/busses/Kconfig

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

drivers/mtd/parsers/Kconfig

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

drivers/net/ethernet/broadcom/Kconfig

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

drivers/pci/controller/Kconfig

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

drivers/phy/broadcom/Kconfig

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