* [PATCH v3 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA
@ 2022-08-03 17:54 William Zhang
2022-08-03 17:54 ` [PATCH v3 6/9] arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA William Zhang
0 siblings, 1 reply; 3+ messages in thread
From: William Zhang @ 2022-08-03 17:54 UTC (permalink / raw)
To: Linux ARM List
Cc: Broadcom Kernel List, joel.peshkin, dan.beygelman, f.fainelli,
krzysztof.kozlowski, rafal, William Zhang, Rob Herring,
Krzysztof Kozlowski,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, Philipp Zabel, open list:I2C SUBSYSTEM HOST DRIVERS,
open list:MEMORY TECHNOLOGY DEVICES (MTD),
open list:NETWORKING DRIVERS,
open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS,
open list:GENERIC PHY FRAMEWORK, open list:PIN CONTROL SUBSYSTEM,
open list:BROADCOM BMIPS MIPS ARCHITECTURE,
open list:SERIAL DRIVERS, open list:WATCHDOG DEVICE DRIVERS,
Catalin Marinas, Will Deacon
[-- Attachment #1.1: Type: text/plain, Size: 3276 bytes --]
BCM4908 is one of the Broadcom Broadband origin WLAN Router/Access
Pointer SoCs. It was originally added by Rafał before Broadcom started
to upstream the support for broadband SoCs. All other ARM based Broadcom
Broadband SoCs are now supported under arch ARCH_BCMBCA. This patch
series migrate the BCM4908 support to ARCH_BCMBCA.
Changes in v3:
- Add Reviewed-by tag
- Add Acked-by tags
- Remove the dts break warning from commit message
Changes in v2:
- Add Acked-by tag
- Improve commit message with more details
- Insert the 4908 generic compatible string in alphabetical order
William Zhang (9):
dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
dt-bindings: arm64: bcmbca: Update BCM4908 description
arm64: dts: bcmbca: update BCM4908 board dts files
arm64: dts: Move BCM4908 dts to bcmbca folder
arm64: dts: Add BCM4908 generic board dts
arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA
arm64: bcmbca: Merge ARCH_BCM4908 to ARCH_BCMBCA
MAINTAINERS: Add BCM4908 maintainer to BCMBCA entry
arm64: defconfig: remove BCM4908
.../bindings/arm/bcm/brcm,bcm4908.yaml | 42 -------------------
.../bindings/arm/bcm/brcm,bcmbca.yaml | 25 +++++++++++
MAINTAINERS | 1 +
arch/arm64/Kconfig.platforms | 10 +----
arch/arm64/boot/dts/broadcom/Makefile | 1 -
arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 ---
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 5 +++
.../bcm4906-netgear-r8000p.dts | 2 +-
.../bcm4906-tplink-archer-c2300-v1.dts | 2 +-
.../broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
.../bcm4908-asus-gt-ac5300.dts | 2 +-
.../bcm4908-netgear-raxe500.dts | 2 +-
.../broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
.../boot/dts/broadcom/bcmbca/bcm94908.dts | 30 +++++++++++++
arch/arm64/configs/defconfig | 1 -
drivers/i2c/busses/Kconfig | 4 +-
drivers/mtd/parsers/Kconfig | 6 +--
drivers/net/ethernet/broadcom/Kconfig | 4 +-
drivers/pci/controller/Kconfig | 2 +-
drivers/phy/broadcom/Kconfig | 4 +-
drivers/pinctrl/bcm/Kconfig | 4 +-
drivers/reset/Kconfig | 2 +-
drivers/soc/bcm/bcm63xx/Kconfig | 4 +-
drivers/tty/serial/Kconfig | 4 +-
drivers/watchdog/Kconfig | 2 +-
25 files changed, 84 insertions(+), 80 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (96%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (99%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (97%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (89%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 144 bytes --]
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v3 6/9] arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA
2022-08-03 17:54 [PATCH v3 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
@ 2022-08-03 17:54 ` William Zhang
2022-08-15 16:57 ` Florian Fainelli
0 siblings, 1 reply; 3+ messages in thread
From: William Zhang @ 2022-08-03 17:54 UTC (permalink / raw)
To: Linux ARM List
Cc: Broadcom Kernel List, joel.peshkin, dan.beygelman, f.fainelli,
krzysztof.kozlowski, rafal, William Zhang, Guenter Roeck,
Bjorn Helgaas, Wolfram Sang, Philipp Zabel, Miquel Raynal,
David S. Miller, Rob Herring, Kishon Vijay Abraham I, Vinod Koul,
Linus Walleij, Greg Kroah-Hartman, Wim Van Sebroeck,
open list:I2C SUBSYSTEM HOST DRIVERS, open list,
open list:MEMORY TECHNOLOGY DEVICES (MTD),
open list:NETWORKING DRIVERS,
open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS,
open list:GENERIC PHY FRAMEWORK, open list:PIN CONTROL SUBSYSTEM,
open list:BROADCOM BMIPS MIPS ARCHITECTURE,
open list:SERIAL DRIVERS, open list:WATCHDOG DEVICE DRIVERS
[-- Attachment #1.1: Type: text/plain, Size: 7653 bytes --]
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)
---
Changes in v3:
- Add Acked-by tags
Changes in v2:
- Add Acked-by tags
- Update commit message with more details
drivers/i2c/busses/Kconfig | 4 ++--
drivers/mtd/parsers/Kconfig | 6 +++---
drivers/net/ethernet/broadcom/Kconfig | 4 ++--
drivers/pci/controller/Kconfig | 2 +-
drivers/phy/broadcom/Kconfig | 4 ++--
drivers/pinctrl/bcm/Kconfig | 4 ++--
drivers/reset/Kconfig | 2 +-
drivers/soc/bcm/bcm63xx/Kconfig | 4 ++--
drivers/tty/serial/Kconfig | 4 ++--
drivers/watchdog/Kconfig | 2 +-
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 45a4e9f1b639..fd9a4dd01997 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -487,8 +487,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 b43df73927a0..d6db655a1d24 100644
--- 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 56e0fb07aec7..f4e1ca68d831 100644
--- 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 d1c5fcf00a8a..bfd9bac37e24 100644
--- 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 93a6a8ee4716..1d89a2fd9b79 100644
--- 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 8f4d89806fcb..35b51ce4298e 100644
--- 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 f9a7cee01659..7ae71535fe2a 100644
--- 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
help
This enables a simple reset controller driver for reset lines that
that can be asserted and deasserted by toggling bits in a contiguous,
diff --git a/drivers/soc/bcm/bcm63xx/Kconfig b/drivers/soc/bcm/bcm63xx/Kconfig
index 9e501c8ac5ce..355c34482076 100644
--- 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 e3279544b03c..f32bb01c3feb 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1100,8 +1100,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 32fd37698932..1f85ec8a4b3b 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -1798,7 +1798,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
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 144 bytes --]
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 6/9] arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA
2022-08-03 17:54 ` [PATCH v3 6/9] arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA William Zhang
@ 2022-08-15 16:57 ` Florian Fainelli
0 siblings, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2022-08-15 16:57 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: Broadcom Kernel List, joel.peshkin, dan.beygelman, f.fainelli,
krzysztof.kozlowski, rafal, Guenter Roeck, Bjorn Helgaas,
Wolfram Sang, Philipp Zabel, Miquel Raynal, David S. Miller,
Rob Herring, Kishon Vijay Abraham I, Vinod Koul, Linus Walleij,
Greg Kroah-Hartman, Wim Van Sebroeck,
open list:I2C SUBSYSTEM HOST DRIVERS, open list,
open list:MEMORY TECHNOLOGY DEVICES (MTD),
open list:NETWORKING DRIVERS,
open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS,
open list:GENERIC PHY FRAMEWORK, open list:PIN CONTROL SUBSYSTEM,
open list:BROADCOM BMIPS MIPS ARCHITECTURE,
open list:SERIAL DRIVERS, open list:WATCHDOG DEVICE DRIVERS
On 8/3/22 10:54, William Zhang wrote:
> 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)
Applied to https://github.com/Broadcom/stblinux/commits/drivers/next,
thanks!
--
Florian
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-08-15 17:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-03 17:54 [PATCH v3 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
2022-08-03 17:54 ` [PATCH v3 6/9] arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA William Zhang
2022-08-15 16:57 ` Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).