arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA
Subsystems (16)
William Zhang
maintainerv3 cover arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA
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.dtsSignature · 1 line
2.34.1
William Zhang
maintainerPATCH v3 1/9 dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
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. Now that Broadcom Broadband SoC is supported under arch ARCH_BCMBCA, this patch moves BCM4908 SoC device tree descriptions into BCMBCA binding.
---
Changes in v3:
- Add Reviewed-by tag
Changes in v2:
- Add Acked-by tag
- Improve commit message with more details
.../bindings/arm/bcm/brcm,bcm4908.yaml | 42 ------------------- .../bindings/arm/bcm/brcm,bcmbca.yaml | 21 ++++++++++ 2 files changed, 21 insertions(+), 42 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml deleted +0 -42
@@ -1,42 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4908.yaml# -$schema: http://devicetree.org/meta-schemas/core.yaml# - -title: Broadcom BCM4908 device tree bindings - -description: - Broadcom BCM4906 / BCM4908 / BCM49408 Wi-Fi/network SoCs with Brahma CPUs. - -maintainers: - - Rafał Miłecki <[email protected]> - -properties: - $nodename: - const: '/' - compatible: - oneOf: - - description: BCM4906 based boards - items: - - enum: - - netgear,r8000p - - tplink,archer-c2300-v1 - - const: brcm,bcm4906 - - const: brcm,bcm4908 - - - description: BCM4908 based boards - items: - - enum: - - asus,gt-ac5300 - - netgear,raxe500 - - const: brcm,bcm4908 - - - description: BCM49408 based boards - items: - - const: brcm,bcm49408 - - const: brcm,bcm4908 - -additionalProperties: true - -...
Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml +21 -0
@@ -15,6 +15,7 @@ maintainers: - William Zhang <[email protected]> - Anand Gore <[email protected]> - Kursad Oney <[email protected]> + - Rafał Miłecki <[email protected]> properties: $nodename:
@@ -28,6 +29,26 @@ properties: - const: brcm,bcm47622 - const: brcm,bcmbca + - description: BCM4906 based boards + items: + - enum: + - netgear,r8000p + - tplink,archer-c2300-v1 + - const: brcm,bcm4906 + - const: brcm,bcm4908 + + - description: BCM4908 based boards + items: + - enum: + - asus,gt-ac5300 + - netgear,raxe500 + - const: brcm,bcm4908 + + - description: BCM49408 based boards + items: + - const: brcm,bcm49408 + - const: brcm,bcm4908 + - description: BCM4912 based boards items: - enum:
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
Quoted 11 lines · William Zhang
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. Now that Broadcom Broadband SoC is supported under arch
ARCH_BCMBCA, this patch moves BCM4908 SoC device tree descriptions into BCMBCA binding.Signed-off-by William Zhang <[email protected]>Acked-by Rafał Miłecki <[email protected]>Reviewed-by Rob Herring <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/devicetree/next, thanks!
Signature · 1 line
Florian
William Zhang
maintainerPATCH v3 2/9 dt-bindings: arm64: bcmbca: Update BCM4908 description
In reply to William ZhangAppend "brcm,bcmbca" to BCM4908 chip family compatible strings to follow the convention of BCMBCA chip and help identifying chip family.
Also add a bare bone generic 4908 board compatbile string to support any 4908 based board. This is useful for board bring-up test and kernel test with CPU and memory related change.
---
Changes in v3:
- Add Acked-by tag
Changes in v2:
- Add Acked-by tag
- Insert the 4908 generic compatible string in alphabetical order
- Update commit message with more details of 4908 generic board dts
Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml +4 -0
@@ -36,18 +36,22 @@ properties: - tplink,archer-c2300-v1 - const: brcm,bcm4906 - const: brcm,bcm4908 + - const: brcm,bcmbca - description: BCM4908 based boards items: - enum: - asus,gt-ac5300 + - brcm,bcm94908 - netgear,raxe500 - const: brcm,bcm4908 + - const: brcm,bcmbca - description: BCM49408 based boards items: - const: brcm,bcm49408 - const: brcm,bcm4908 + - const: brcm,bcmbca - description: BCM4912 based boards items:
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 2/9] dt-bindings: arm64: bcmbca: Update BCM4908 description
Quoted 7 lines · William Zhang
Append "brcm,bcmbca" to BCM4908 chip family compatible strings to follow the convention of BCMBCA chip and help identifying chip family.
Also add a bare bone generic 4908 board compatbile string to support any 4908 based board. This is useful for board bring-up test and kernel test with CPU and memory related change.
Quoted 5 lines
Signed-off-by William Zhang <[email protected]>Acked-by Rafał Miłecki <[email protected]>Acked-by Rob Herring <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v3 3/9 arm64: dts: bcmbca: update BCM4908 board dts files
In reply to William ZhangAppend "brcm,bcmbca" to compatible strings based on the new bcmbca binding rule for BCM4908 family based boards.
---
Changes in v3:
- Remove the dts break warning from commit message
Changes in v2:
- Add Acked-by tag
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 2 +- .../dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 2 +- arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 2 +- .../arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts +1 -1
@@ -7,7 +7,7 @@ #include "bcm4906.dtsi" / { - compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908"; + compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca"; model = "Netgear R8000P"; memory@0 {
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts +1 -1
@@ -7,7 +7,7 @@ #include "bcm4906.dtsi" / { - compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908"; + compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca"; model = "TP-Link Archer C2300 V1"; memory@0 {
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts +1 -1
@@ -6,7 +6,7 @@ #include "bcm4908.dtsi" / { - compatible = "asus,gt-ac5300", "brcm,bcm4908"; + compatible = "asus,gt-ac5300", "brcm,bcm4908", "brcm,bcmbca"; model = "Asus GT-AC5300"; memory@0 {
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts +1 -1
@@ -3,7 +3,7 @@ #include "bcm4908.dtsi" / { - compatible = "netgear,raxe500", "brcm,bcm4908"; + compatible = "netgear,raxe500", "brcm,bcm4908", "brcm,bcmbca"; model = "Netgear RAXE500"; memory@0 {
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 3/9] arm64: dts: bcmbca: update BCM4908 board dts files
Quoted 7 lines · William Zhang
Append "brcm,bcmbca" to compatible strings based on the new bcmbca binding rule for BCM4908 family based boards.
Signed-off-by William Zhang <[email protected]>Acked-by Rafał Miłecki <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v3 4/9 arm64: dts: Move BCM4908 dts to bcmbca folder
In reply to William ZhangAs part of ARCH_BCM4908 to ARCH_BCMBCA migration, move the BCM4908 dts files to bcmbca folder and use CONFIG_ARCH_BCMBCA to build all the BCM4908 board dts. Delete bcm4908 folder and its makefile as well.
---
(no changes since v1)
arch/arm64/boot/dts/broadcom/Makefile | 1 -
arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -----
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++
.../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0
.../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
.../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0
.../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
9 files changed, 4 insertions(+), 6 deletions(-)
delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%)arch/arm64/boot/dts/broadcom/Makefile +0 -1
@@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \ bcm2837-rpi-cm3-io3.dtb \ bcm2837-rpi-zero-2-w.dtb -subdir-y += bcm4908 subdir-y += bcmbca subdir-y += northstar2 subdir-y += stingray
arch/arm64/boot/dts/broadcom/bcm4908/Makefile deleted +0 -5
@@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb -dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb -dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb
arch/arm64/boot/dts/broadcom/bcmbca/Makefile +4 -0
@@ -1,5 +1,9 @@ # SPDX-License-Identifier: GPL-2.0 dtb-$(CONFIG_ARCH_BCMBCA) += \ + bcm4906-netgear-r8000p.dtb \ + bcm4906-tplink-archer-c2300-v1.dtb \ + bcm4908-asus-gt-ac5300.dtb \ + bcm4908-netgear-raxe500.dtb \ bcm4912-asus-gt-ax6000.dtb \ bcm94912.dtb \ bcm963158.dtb \
arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts renamed from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts +0 -0
arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts renamed from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts +0 -0
arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi renamed from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi +0 -0
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts renamed from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts +0 -0
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts renamed from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts +0 -0
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi renamed from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +0 -0
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder
Quoted 6 lines · William Zhang
As part of
ARCH_BCM4908toARCH_BCMBCAmigration, move the BCM4908 dts files to bcmbca folder and useCONFIG_ARCH_BCMBCAto build all the BCM4908 board dts. Delete bcm4908 folder and its makefile as well.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v3 5/9 arm64: dts: Add BCM4908 generic board dts
In reply to William ZhangAdd generic bare bone bcm94908.dts file to support any 4908 based design. It supports cpu subsystem, memory and an uart console. This can be useful for board bring-up and cpu subsystem and memory related kernel test as well.
---
(no changes since v2)
Changes in v2:
- Update commit message with more details
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 1 + .../boot/dts/broadcom/bcmbca/bcm94908.dts | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
arch/arm64/boot/dts/broadcom/bcmbca/Makefile +1 -0
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCMBCA) += \ bcm4906-tplink-archer-c2300-v1.dtb \ bcm4908-asus-gt-ac5300.dtb \ bcm4908-netgear-raxe500.dtb \ + bcm94908.dtb \ bcm4912-asus-gt-ax6000.dtb \ bcm94912.dtb \ bcm963158.dtb \
arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts new file +30 -0
@@ -0,0 +1,30 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2022 Broadcom Ltd. + */ + +/dts-v1/; + +#include "bcm4908.dtsi" + +/ { + model = "Broadcom BCM94908 Reference Board"; + compatible = "brcm,bcm94908", "brcm,bcm4908", "brcm,bcmbca"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x08000000>; + }; +}; + +&uart0 { + status = "okay"; +};
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 5/9] arm64: dts: Add BCM4908 generic board dts
Quoted 8 lines · William Zhang
Add generic bare bone
bcm94908.dtsfile to support any 4908 based design. It supports cpu subsystem, memory and an uart console. This can be useful for board bring-up and cpu subsystem and memory related kernel test as well.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v3 6/9 arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA
In reply to William ZhangWith 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.
---
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(-)
drivers/i2c/busses/Kconfig +2 -2
@@ -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
drivers/mtd/parsers/Kconfig +3 -3
@@ -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
@@ -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
@@ -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
@@ -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
drivers/pinctrl/bcm/Kconfig +2 -2
@@ -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.
drivers/reset/Kconfig +1 -1
@@ -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,
drivers/soc/bcm/bcm63xx/Kconfig +2 -2
@@ -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
drivers/tty/serial/Kconfig +2 -2
@@ -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:
drivers/watchdog/Kconfig +1 -1
@@ -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
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 6/9] arm64: bcmbca: Make BCM4908 drivers depend on ARCH_BCMBCA
Quoted 9 lines · William Zhang
With Broadcom Broadband arch
ARCH_BCMBCAsupported in the kernel, this patch series migrate theARCH_BCM4908symbol toARCH_BCMBCA. Hence replaceARCH_BCM4908withARCH_BCMBCAin subsystemKconfigfiles.
Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
Signature · 1 line
Florian
William Zhang
maintainerPATCH v3 7/9 arm64: bcmbca: Merge ARCH_BCM4908 to ARCH_BCMBCA
In reply to William ZhangDelete ARCH_BCM4908 platform Kconfig for BCM4908 SoC as it is replaced by ARCH_BCMBCA and move its selection to ARCH_BCMBCA.
---
(no changes since v1)
arch/arm64/Kconfig.platforms | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
arch/arm64/Kconfig.platforms +1 -9
@@ -47,15 +47,6 @@ config ARCH_BCM2835 This enables support for the Broadcom BCM2837 and BCM2711 SoC. These SoCs are used in the Raspberry Pi 3 and 4 devices. -config ARCH_BCM4908 - bool "Broadcom BCM4908 family" - select ARCH_BCMBCA - select GPIOLIB - help - This enables support for the Broadcom BCM4906, BCM4908 and - BCM49408 SoCs. These SoCs use Brahma-B53 cores and can be - found in home routers. - config ARCH_BCM_IPROC bool "Broadcom iProc SoC Family" select COMMON_CLK_IPROC
@@ -66,6 +57,7 @@ config ARCH_BCM_IPROC config ARCH_BCMBCA bool "Broadcom Broadband Carrier Access (BCA) origin SoC" + select GPIOLIB help Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based BCA chipset.
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 7/9] arm64: bcmbca: Merge ARCH_BCM4908 to ARCH_BCMBCA
Quoted 5 lines · William Zhang
Delete
ARCH_BCM4908platformKconfigfor BCM4908 SoC as it is replaced byARCH_BCMBCAand move its selection toARCH_BCMBCA.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v3 8/9 MAINTAINERS: Add BCM4908 maintainer to BCMBCA entry
In reply to William ZhangSince BCM4908 SoC support is merged into ARCH_BCMBCA, add BCM4908 maintainer Rafal to bcmbca maintainer list.
---
(no changes since v1)
MAINTAINERS | 1 + 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
@@ -3919,6 +3919,7 @@ M: William Zhang <[email protected]> M: Anand Gore <[email protected]> M: Kursad Oney <[email protected]> M: Florian Fainelli <[email protected]> +M: Rafał Miłecki <[email protected]> R: Broadcom internal kernel review list <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 8/9] MAINTAINERS: Add BCM4908 maintainer to BCMBCA entry
Quoted 5 lines · William Zhang
Since BCM4908 SoC support is merged into
ARCH_BCMBCA, add BCM4908 maintainer Rafal to bcmbca maintainer list.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/maintainers/next, thanks! --
Florian
William Zhang
maintainerPATCH v3 9/9 arm64: defconfig: remove BCM4908
In reply to William ZhangRemove CONFIG_ARCH_BCM4908. It is supported under CONFIG_ARCH_BCMBCA.
---
(no changes since v1)
arch/arm64/configs/defconfig | 1 - 1 file changed, 1 deletion(-)
arch/arm64/configs/defconfig +0 -1
@@ -35,7 +35,6 @@ CONFIG_ARCH_SUNXI=y CONFIG_ARCH_ALPINE=y CONFIG_ARCH_APPLE=y CONFIG_ARCH_BCM2835=y -CONFIG_ARCH_BCM4908=y CONFIG_ARCH_BCMBCA=y CONFIG_ARCH_BCM_IPROC=y CONFIG_ARCH_BERLIN=y
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v3 9/9] arm64: defconfig: remove BCM4908
Quoted 5 lines · William Zhang
Remove
CONFIG_ARCH_BCM4908. It is supported underCONFIG_ARCH_BCMBCA.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/defconfig-arm64/next, thanks! --
Florian