arm: bcmbca: Move BCM63138 SoC support under ARCH_BCMBCA
Subsystems (6)
William Zhang
maintainerv2 cover arm: bcmbca: Move BCM63138 SoC support under ARCH_BCMBCA
Now that Broadcom Broadband arch ARCH_BCMBCA is in the kernel, this change migrates the existing broadband chip BCM63138 support to ARCH_BCMBCA. It also delete the old ARCH_BCM_63XX config as no other chip uses it.
Verified on BCM963138REF board with ramdisk boot.
Changes in v2:
- Remove the unrelated node and and uart clock name changes
- Move patch 5 to a separate patchset with one patch per subsystem. See [1] and its following patches.
William Zhang (8):
dt-bindings: arm: add BCM63138 SoC
ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
ARM: dts: update dts files for bcmbca SoC BCM63138
ARM: dts: Add BCM63138 generic board dts
arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
arm: bcmbca: Add BCMBCA sub platforms
MAINTAINERS: Move BCM63138 to bcmbca arch entry
ARM: multi_v7_defconfig: Update configs for BCM63138
.../bindings/arm/bcm/brcm,bcmbca.yaml | 8 +++ MAINTAINERS | 10 +-- arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/bcm63138.dtsi | 4 +- arch/arm/boot/dts/bcm963138.dts | 27 ++++++++ arch/arm/boot/dts/bcm963138dvt.dts | 2 +- arch/arm/configs/multi_v7_defconfig | 4 +- arch/arm/mach-bcm/Kconfig | 61 +++++++++++++------ arch/arm/mach-bcm/Makefile | 7 +-- arch/arm/mach-bcm/bcm63xx.c | 17 ------ 10 files changed, 89 insertions(+), 55 deletions(-) create mode 100644 arch/arm/boot/dts/bcm963138.dts delete mode 100644 arch/arm/mach-bcm/bcm63xx.c
[1]: https://lists.infradead.org/pipermail/linux-arm-kernel/2022-July/758522.html
Signature · 1 line
2.34.1
William Zhang
maintainerPATCH v2 1/8 dt-bindings: arm: add BCM63138 SoC
Add BCM63138 SoC device tree description to bcmbca binding document.
---
(no changes since v1)
.../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 8 ++++++++ 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml +8 -0
@@ -35,6 +35,14 @@ properties: - const: brcm,bcm4912 - const: brcm,bcmbca + - description: BCM63138 based boards + items: + - enum: + - brcm,bcm963138 + - brcm,BCM963138DVT + - const: brcm,bcm63138 + - const: brcm,bcmbca + - description: BCM63146 based boards items: - enum:
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v2 1/8] dt-bindings: arm: add BCM63138 SoC
Quoted 5 lines · William Zhang
Add BCM63138 SoC device tree description to bcmbca binding document.
Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v2 2/8 ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
In reply to William ZhangUse CONFIG_ARCH_BCMBCA to build all the BCMBCA SoC dts and remove CONFIG_ARCH_BCM_63XX from the makefile
---
(no changes since v1)
arch/arm/boot/dts/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/arm/boot/dts/Makefile +1 -2
@@ -147,8 +147,6 @@ dtb-$(CONFIG_ARCH_BCM_53573) += \ bcm47189-luxul-xap-810.dtb \ bcm47189-tenda-ac9.dtb \ bcm947189acdbmr.dtb -dtb-$(CONFIG_ARCH_BCM_63XX) += \ - bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ bcm911360_entphn.dtb \ bcm911360k.dtb \
@@ -184,6 +182,7 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \ bcm7445-bcm97445svmb.dtb dtb-$(CONFIG_ARCH_BCMBCA) += \ bcm947622.dtb \ + bcm963138dvt.dtb \ bcm963148.dtb \ bcm963178.dtb \ bcm96756.dtb \
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v2 2/8] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
Quoted 5 lines · William Zhang
Use
CONFIG_ARCH_BCMBCAto build all the BCMBCA SoC dts and removeCONFIG_ARCH_BCM_63XXfrom the makefileSigned-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
Re: [PATCH v2 2/8] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
In reply to William ZhangQuoted 25 lines · William Zhang
Use
CONFIG_ARCH_BCMBCAto build all the BCMBCA SoC dts and removeCONFIG_ARCH_BCM_63XXfrom the makefileSigned-off-by William Zhang <[email protected]>---
(no changes since v1)
arch/arm/boot/dts/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/arm/boot/dts/Makefile +0
-2@@ -147,8 +147,6 @@ dtb-$(CONFIG_ARCH_BCM_53573) += \ bcm47189-luxul-xap-810.dtb \ bcm47189-tenda-ac9.dtb \ bcm947189acdbmr.dtb -dtb-$(CONFIG_ARCH_BCM_63XX) += \ - bcm963138dvt.dtb dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ bcm911360_entphn.dtb \ bcm911360k.dtb \
arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_BRCMSTB) += \ · line 188
Quoted 7 lines
arch/arm/boot/dts/Makefile +1
-0@@ -184,6 +182,7 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \ bcm7445-bcm97445svmb.dtb dtb-$(CONFIG_ARCH_BCMBCA) += \ bcm947622.dtb \ + bcm963138dvt.dtb \ bcm963148.dtb \ bcm963178.dtb \ bcm96756.dtb \
Do we want to mix all that DT files? Are ARCH_BCM_63XX (ex-)users interested in compiling all of them?
For IPROC SoCs we have separated symbols: ARCH_BCM_CYGNUS / ARCH_BCM_HR2 / ARCH_BCM_NSP / ARCH_BCM_5301X and we compile arch specific DT files only.
Re: [PATCH v2 2/8] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
Quoted 37 lines · Rafał Miłecki
Quoted 25 lines · William Zhang
Use
CONFIG_ARCH_BCMBCAto build all the BCMBCA SoC dts and removeCONFIG_ARCH_BCM_63XXfrom the makefileSigned-off-by William Zhang <[email protected]>---
(no changes since v1)
arch/arm/boot/dts/Makefile| 3 +--1 file changed, 1 insertion(+), 2 deletions(-)arch/arm/boot/dts/Makefile +0
-0@@ -147,8 +147,6 @@ dtb-$(CONFIG_ARCH_BCM_53573) += \ bcm47189-luxul-xap-810.dtb \ bcm47189-tenda-ac9.dtb \bcm947189acdbmr.dtb
-dtb-$(CONFIG_ARCH_BCM_63XX) += \
- bcm963138dvt.dtb
dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
bcm911360_entphn.dtb \
bcm911360k.dtb \arch/arm/boot/dts/Makefile +0
-0@@ -184,6 +182,7 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \Quoted 7 lines
bcm7445-bcm97445svmb.dtb
dtb-$(CONFIG_ARCH_BCMBCA) += \
bcm947622.dtb \
+ bcm963138dvt.dtb \
bcm963148.dtb \
bcm963178.dtb \
bcm96756.dtb \Do we want to mix all that DT files? Are
ARCH_BCM_63XX(ex-)users interested in compiling all of them?
Quoted 3 lines
For IPROC SoCs we have separated symbols:
ARCH_BCM_CYGNUS/ARCH_BCM_HR2/ARCH_BCM_NSP/ARCH_BCM_5301Xand we compile arch specific DT files only.
I am fine with that and build systems (buildroot and OpenWrt at least) typically offer a way to produce a device specific image that will contain a single DTB fit for the target device.
What we would be optimizing for would be build time vs. coverage, as a maintainer I favor coverage as it allows me to build everyone in one sweep. We could make the building of the 63138 conditional upon BCMBCA_CORTEXA9 if that bothers you.
Signature · 1 line
Florian
William Zhang
maintainerPATCH v2 3/8 ARM: dts: update dts files for bcmbca SoC BCM63138
In reply to William ZhangUpdate BCM63138 board compatible string based on binding document.
---
Changes in v2:
- Remove the unrelated node and and uart clock name changes
arch/arm/boot/dts/bcm63138.dtsi | 4 ++-- arch/arm/boot/dts/bcm963138dvt.dts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm63138.dtsi +2 -2
@@ -9,8 +9,8 @@ / { #address-cells = <1>; #size-cells = <1>; - compatible = "brcm,bcm63138"; - model = "Broadcom BCM63138 DSL SoC"; + compatible = "brcm,bcm63138", "brcm,bcmbca"; + model = "Broadcom BCM963138 Reference Board"; interrupt-parent = <&gic>; aliases {
arch/arm/boot/dts/bcm963138dvt.dts +1 -1
@@ -8,7 +8,7 @@ #include "bcm63138.dtsi" / { - compatible = "brcm,BCM963138DVT", "brcm,bcm63138"; + compatible = "brcm,BCM963138DVT", "brcm,bcm63138", "brcm,bcmbca"; model = "Broadcom BCM963138DVT"; chosen {
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v2 3/8] ARM: dts: update dts files for bcmbca SoC BCM63138
Quoted 5 lines · William Zhang
Update BCM63138 board compatible string based on binding document.
Signed-off-by William Zhang <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v2 4/8 ARM: dts: Add BCM63138 generic board dts
In reply to William ZhangAdd generic bcm963138.dts file.
---
(no changes since v1)
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm963138.dts | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 arch/arm/boot/dts/bcm963138.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -182,6 +182,7 @@ dtb-$(CONFIG_ARCH_BRCMSTB) += \ bcm7445-bcm97445svmb.dtb dtb-$(CONFIG_ARCH_BCMBCA) += \ bcm947622.dtb \ + bcm963138.dtb \ bcm963138dvt.dtb \ bcm963148.dtb \ bcm963178.dtb \
arch/arm/boot/dts/bcm963138.dts new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright 2022 Broadcom Ltd. + */ + +/dts-v1/; + +#include "bcm63138.dtsi" + +/ { + model = "Broadcom BCM963138 Reference Board"; + compatible = "brcm,bcm963138", "brcm,bcm63138", "brcm,bcmbca"; + + chosen { + bootargs = "console=ttyS0,115200"; + stdout-path = &serial0; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x08000000>; + }; +}; + +&serial0 { + status = "okay"; +};
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v2 4/8] ARM: dts: Add BCM63138 generic board dts
Quoted 4 lines · William Zhang
Add generic
bcm963138.dtsfile.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
William Zhang
maintainerPATCH v2 5/8 arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
In reply to William ZhangRemove ARCH_BCM_63XX Kconfig for BCM63138 and merge its selections to ARCH_BCMBCA. Delete bcm63xx.c as it is no longer needed.
---
(no changes since v1)
arch/arm/mach-bcm/Kconfig | 26 +++++++++----------------- arch/arm/mach-bcm/Makefile | 7 +------ arch/arm/mach-bcm/bcm63xx.c | 17 ----------------- 3 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 arch/arm/mach-bcm/bcm63xx.c
arch/arm/mach-bcm/Kconfig +9 -17
@@ -182,23 +182,6 @@ config ARCH_BCM_53573 The base chip is BCM53573 and there are some packaging modifications like BCM47189 and BCM47452. -config ARCH_BCM_63XX - bool "Broadcom BCM63xx DSL SoC" - depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER - select ARM_ERRATA_754322 - select ARM_ERRATA_764369 if SMP - select ARM_GIC - select ARM_GLOBAL_TIMER - select CACHE_L2X0 - select HAVE_ARM_ARCH_TIMER - select HAVE_ARM_TWD if SMP - select HAVE_ARM_SCU if SMP - help - This enables support for systems based on Broadcom DSL SoCs. - It currently supports the 'BCM63XX' ARM-based family, which includes - the BCM63138 variant. - config ARCH_BRCMSTB bool "Broadcom BCM7XXX based boards" depends on ARCH_MULTI_V7
@@ -224,10 +207,19 @@ config ARCH_BCMBCA select ARM_AMBA select ARM_GIC select HAVE_ARM_ARCH_TIMER + select ARCH_HAS_RESET_CONTROLLER + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 if SMP + select ARM_GLOBAL_TIMER + select CACHE_L2X0 + select HAVE_ARM_TWD if SMP + select HAVE_ARM_SCU if SMP + help Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based BCA chipset. This enables support for Broadcom BCA ARM-based broadband chipsets, including the DSL, PON and Wireless family of chips. + endif
arch/arm/mach-bcm/Makefile +1 -6
@@ -50,12 +50,6 @@ ifeq ($(CONFIG_ARCH_BCM_5301X),y) obj-$(CONFIG_SMP) += platsmp.o endif -# BCM63XXx -ifeq ($(CONFIG_ARCH_BCM_63XX),y) -obj-y += bcm63xx.o -obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o -endif - ifeq ($(CONFIG_ARCH_BRCMSTB),y) CFLAGS_platsmp-brcmstb.o += -march=armv7-a obj-y += brcmstb.o
@@ -64,5 +58,6 @@ endif # BCMBCA ifeq ($(CONFIG_ARCH_BCMBCA),y) +obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o obj-y += bcmbca.o endif
arch/arm/mach-bcm/bcm63xx.c deleted +0 -17
@@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -// Copyright (C) 2014 Broadcom Corporation - -#include <linux/of_platform.h> - -#include <asm/mach/arch.h> - -static const char *const bcm63xx_dt_compat[] = { -"brcm,bcm63138" , -NULL -}; - -DT_MACHINE_START (BCM63XXX_DT ,"BCM63xx DSL SoC" ) - .dt_compat = bcm63xx_dt_compat, - .l2c_aux_val = 0, - .l2c_aux_mask = ~0 , -MACHINE_END
Signature · 1 line
2.34.1
Re: [PATCH v2 5/8] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
Quoted 4 lines · William Zhang
Remove
ARCH_BCM_63XXKconfigfor BCM63138 and merge its selections toARCH_BCMBCA. Deletebcm63xx.cas it is no longer needed.Signed-off-by William Zhang <[email protected]>
What about ARCH_BCM_63XX references in
1. arch/arm/Kconfig.debug
2. arch/arm/configs/multi_v7_defconfig
Did you handle them in some other patchset?
This change is probably going to break "make oldconfig" for users. Is there any kernel policy for that? Do we care about it? Should we leave old symbol as hidden and make ARCH_BCMBCA auto-selected if it's set?
Finally it'd probably be more clean to first introduce ARCH_BCMBCA_CORTEXA9 and then get rid of ARCH_BCM_63XX.
Quoted 105 lines
---
(no changes since v1)
arch/arm/mach-bcm/Kconfig | 26 +++++++++----------------- arch/arm/mach-bcm/Makefile | 7 +------ arch/arm/mach-bcm/bcm63xx.c | 17 ----------------- 3 files changed, 10 insertions(+), 40 deletions(-)delete mode 100644
arch/arm/mach-bcm/bcm63xx.carch/arm/mach-bcm/Kconfig +9
-17@@ -182,23 +182,6 @@ config ARCH_BCM_53573 The base chip is BCM53573 and there are some packaging modifications like BCM47189 and BCM47452. -config ARCH_BCM_63XX - bool "Broadcom BCM63xx DSL SoC" - depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER - select ARM_ERRATA_754322 - select ARM_ERRATA_764369 if SMP - select ARM_GIC - select ARM_GLOBAL_TIMER - select CACHE_L2X0 - select HAVE_ARM_ARCH_TIMER - select HAVE_ARM_TWD if SMP - select HAVE_ARM_SCU if SMP - help - This enables support for systems based on Broadcom DSL SoCs. - It currently supports the 'BCM63XX' ARM-based family, which includes - the BCM63138 variant. - config ARCH_BRCMSTB bool "Broadcom BCM7XXX based boards" depends on ARCH_MULTI_V7@@ -224,10 +207,19 @@ config ARCH_BCMBCA select ARM_AMBA select ARM_GIC select HAVE_ARM_ARCH_TIMER + select ARCH_HAS_RESET_CONTROLLER + select ARM_ERRATA_754322 + select ARM_ERRATA_764369 if SMP + select ARM_GLOBAL_TIMER + select CACHE_L2X0 + select HAVE_ARM_TWD if SMP + select HAVE_ARM_SCU if SMP + help Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based BCA chipset. This enables support for Broadcom BCA ARM-based broadband chipsets, including the DSL, PON and Wireless family of chips. + endifarch/arm/mach-bcm/Makefile +1
-6@@ -50,12 +50,6 @@ ifeq ($(CONFIG_ARCH_BCM_5301X),y) obj-$(CONFIG_SMP) += platsmp.o endif -# BCM63XXx -ifeq ($(CONFIG_ARCH_BCM_63XX),y) -obj-y += bcm63xx.o -obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o -endif - ifeq ($(CONFIG_ARCH_BRCMSTB),y) CFLAGS_platsmp-brcmstb.o += -march=armv7-a obj-y += brcmstb.o@@ -64,5 +58,6 @@ endif # BCMBCA ifeq ($(CONFIG_ARCH_BCMBCA),y) +obj-$(CONFIG_SMP) += bcm63xx_smp.o bcm63xx_pmb.o obj-y += bcmbca.o endifarch/arm/mach-bcm/bcm63xx.c deleted +0
-17@@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -// Copyright (C) 2014 Broadcom Corporation - -#include <linux/of_platform.h> - -#include <asm/mach/arch.h> - -static const char *const bcm63xx_dt_compat[] = { -"brcm,bcm63138" , -NULL -}; - -DT_MACHINE_START (BCM63XXX_DT ,"BCM63xx DSL SoC" ) - .dt_compat = bcm63xx_dt_compat, - .l2c_aux_val = 0, - .l2c_aux_mask = ~0 , -MACHINE_END
Re: [PATCH v2 5/8] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
Quoted 8 lines · Rafał Miłecki
Quoted 4 lines · William Zhang
Remove
ARCH_BCM_63XXKconfigfor BCM63138 and merge its selections toARCH_BCMBCA. Deletebcm63xx.cas it is no longer needed.Signed-off-by William Zhang <[email protected]>What about
ARCH_BCM_63XXreferences in
1.arch/arm/Kconfig.debug
That one was dealt with:
Quoted 1 line
2.
arch/arm/configs/multi_v7_defconfig
patch 8/8 of this series
Quoted 7 lines
Did you handle them in some other patchset?
This change is probably going to break "make oldconfig" for users. Is there any kernel policy for that? Do we care about it? Should we leave old symbol as hidden and make
ARCH_BCMBCAauto-selected if it's set?
I do not believe anyone but me was enabling CONFIG_ARCH_BCM_63XX so this did not have any users until the BCA team decided to take over.
Quoted 4 lines
Finally it'd probably be more clean to first introduce
ARCH_BCMBCA_CORTEXA9and then get rid ofARCH_BCM_63XX.
That is fair, however a bit late now that the pull requests have been accepted by the soc maintainers.
Thanks!
Signature · 1 line
Florian
Re: [PATCH v2 5/8] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
In reply to William ZhangQuoted 28 lines · William Zhang
Remove
ARCH_BCM_63XXKconfigfor BCM63138 and merge its selections toARCH_BCMBCA. Deletebcm63xx.cas it is no longer needed.Signed-off-by William Zhang <[email protected]>---
(no changes since v1)
arch/arm/mach-bcm/Kconfig | 26 +++++++++----------------- arch/arm/mach-bcm/Makefile | 7 +------ arch/arm/mach-bcm/bcm63xx.c | 17 ----------------- 3 files changed, 10 insertions(+), 40 deletions(-)delete mode 100644
arch/arm/mach-bcm/bcm63xx.carch/arm/mach-bcm/Kconfig +0
-6@@ -182,23 +182,6 @@ config ARCH_BCM_53573 The base chip is BCM53573 and there are some packaging modifications like BCM47189 and BCM47452. -config ARCH_BCM_63XX - bool "Broadcom BCM63xx DSL SoC" - depends on ARCH_MULTI_V7 - select ARCH_HAS_RESET_CONTROLLER - select ARM_ERRATA_754322 - select ARM_ERRATA_764369 if SMP
arch/arm/mach-bcm/Kconfig config ARCH_BCM_53573 · line 200
Quoted 10 lines
arch/arm/mach-bcm/Kconfig +0
-10- select ARM_GIC - select ARM_GLOBAL_TIMER - select CACHE_L2X0 - select HAVE_ARM_ARCH_TIMER - select HAVE_ARM_TWD if SMP - select HAVE_ARM_SCU if SMP - help - This enables support for systems based on Broadcom DSL SoCs. - It currently supports the 'BCM63XX' ARM-based family, which includes - the BCM63138 variant.
Oh, wait a second. This is actually going to totally break builds for people because there are a lot of Kconfig-s that depend on it!
I don't believe it can't be handled this way.
You need to first introduce a replacement / parent symbol. Then (in another release if needed) update all Kconfig-s. Then eventually you can get rid of ARCH_BCM_63XX.
Re: [PATCH v2 5/8] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX to ARCH_BCMBCA
Quoted 43 lines · Rafał Miłecki
Quoted 30 lines · William Zhang
Remove
ARCH_BCM_63XXKconfigfor BCM63138 and merge its selections toARCH_BCMBCA. Deletebcm63xx.cas it is no longer needed.Signed-off-by William Zhang <[email protected]>---
(no changes since v1)
arch/arm/mach-bcm/Kconfig | 26 +++++++++----------------- arch/arm/mach-bcm/Makefile | 7 +------
arch/arm/mach-bcm/bcm63xx.c| 17 -----------------3 files changed, 10 insertions(+), 40 deletions(-)delete mode 100644
arch/arm/mach-bcm/bcm63xx.carch/arm/mach-bcm/Kconfig +0
-0@@ -182,23 +182,6 @@ config ARCH_BCM_53573The base chip is BCM53573 and there are some packaging modifications like BCM47189 and BCM47452.
-configARCH_BCM_63XX
- bool "Broadcom BCM63xx DSL SoC"
- depends onARCH_MULTI_V7
- selectARCH_HAS_RESET_CONTROLLER
- selectARM_ERRATA_754322
- selectARM_ERRATA_764369if SMP
- selectARM_GIC
- selectARM_GLOBAL_TIMER
- selectCACHE_L2X0Quoted 8 lines
- select
HAVE_ARM_ARCH_TIMER
- selectHAVE_ARM_TWDif SMP
- selectHAVE_ARM_SCUif SMP
- help
- This enables support for systems based on Broadcom DSL SoCs. - It currently supports the 'BCM63XX' ARM-based family, which includes
- the BCM63138 variant.Oh, wait a second. This is actually going to totally break builds for people because there are a lot of Kconfig-s that depend on it!
Quoted 5 lines
I don't believe it can't be handled this way.
You need to first introduce a replacement / parent symbol. Then (in another release if needed) update all Kconfig-s. Then eventually you can get rid of
ARCH_BCM_63XX.
This works because ARCH_BCMBCA was introdcuced in v5.19-rc1 with b32c613b3fda3 and in patch 8 the defconfig is updated to select ARCH_BCMBCA.
Signature · 1 line
Florian
William Zhang
maintainerPATCH v2 6/8 arm: bcmbca: Add BCMBCA sub platforms
In reply to William ZhangCreate new CORTEXA7, CORTEXA9 and BRAHMAB15 BCMBCA sub platform configs to enable fine-grained selection for each type of ARMv7 SoC.
---
(no changes since v1)
arch/arm/mach-bcm/Kconfig | 45 +++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-)
arch/arm/mach-bcm/Kconfig +39 -6
@@ -201,25 +201,58 @@ config ARCH_BRCMSTB This enables support for Broadcom ARM-based set-top box chipsets, including the 7445 family of chips. -config ARCH_BCMBCA +menuconfig ARCH_BCMBCA bool "Broadcom Broadband SoC" depends on ARCH_MULTI_V7 select ARM_AMBA select ARM_GIC select HAVE_ARM_ARCH_TIMER - select ARCH_HAS_RESET_CONTROLLER + help + Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based + BCA chipset. + + This enables support for Broadcom BCA ARM-based broadband chipsets, + including the DSL, PON and Wireless family of chips. + +comment "BCMBCA sub platforms" + +if ARCH_BCMBCA + +config ARCH_BCMBCA_CORTEXA7 + bool "Cortex-A7 SoCs" + help + Say Y if you intend to run the kernel on a Broadcom Broadband ARM A7 + based chipset. + + This enables support for Broadcom BCA ARM A7 broadband chipsets, + including various DSL, PON and Wireless family of chips. + +config ARCH_BCMBCA_CORTEXA9 + bool "Cortex-A9 SoCS" select ARM_ERRATA_754322 select ARM_ERRATA_764369 if SMP + select ARCH_HAS_RESET_CONTROLLER select ARM_GLOBAL_TIMER select CACHE_L2X0 select HAVE_ARM_TWD if SMP select HAVE_ARM_SCU if SMP + help + Say Y if you intend to run the kernel on a Broadcom Broadband ARM A9 + based BCA chipset. + This enables support for Broadcom BCA ARM A9 broadband chipset. Currently + only DSL chip BCM63138. + +config ARCH_BCMBCA_BRAHMAB15 + bool "Brahma-B15 SoCs" + select ARM_ERRATA_798181 if SMP help - Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based - BCA chipset. + Say Y if you intend to run the kernel on a Broadcom Broadband ARM B15 + based BCA chipset. - This enables support for Broadcom BCA ARM-based broadband chipsets, - including the DSL, PON and Wireless family of chips. + This enables support for Broadcom BCA ARM B15 broadband chipset. Currently + only DSL chip BCM63148. + +endif endif
Signature · 1 line
2.34.1
William Zhang
maintainerPATCH v2 7/8 MAINTAINERS: Move BCM63138 to bcmbca arch entry
In reply to William ZhangMove BCM63138 related files to BCMBCA ARCH maintainer list entry and delete the BCM63XX ARM ARCHITECTURE entry
---
(no changes since v1)
MAINTAINERS | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
MAINTAINERS +2 -8
@@ -3898,6 +3898,7 @@ BROADCOM BCMBCA ARM ARCHITECTURE M: William Zhang <[email protected]> M: Anand Gore <[email protected]> M: Kursad Oney <[email protected]> +M: Florian Fainelli <[email protected]> R: Broadcom internal kernel review list <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained
@@ -3907,6 +3908,7 @@ F: arch/arm64/boot/dts/broadcom/bcmbca/* N: bcmbca N: bcm[9]?47622 N: bcm[9]?4912 +N: bcm[9]?63138 N: bcm[9]?63146 N: bcm[9]?63148 N: bcm[9]?63158
@@ -3993,14 +3995,6 @@ S: Maintained F: arch/arm/boot/dts/bcm47189* F: arch/arm/boot/dts/bcm53573* -BROADCOM BCM63XX ARM ARCHITECTURE -M: Florian Fainelli <[email protected]> -R: Broadcom internal kernel review list <[email protected]> -L: [email protected] (moderated for non-subscribers) -S: Maintained -T: git git://github.com/broadcom/stblinux.git -N: bcm63xx - BROADCOM BCM63XX/BCM33XX UDC DRIVER M: Kevin Cernekee <[email protected]> L: [email protected]
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v2 7/8] MAINTAINERS: Move BCM63138 to bcmbca arch entry
Quoted 5 lines · William Zhang
Move BCM63138 related files to BCMBCA ARCH maintainer list entry and delete the BCM63XX ARM ARCHITECTURE entry
Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/maintainers/next, thanks! --
Florian
William Zhang
maintainerPATCH v2 8/8 ARM: multi_v7_defconfig: Update configs for BCM63138
In reply to William ZhangRemove CONFIG_ARCH_BCM_63XX and add BCMBCA sub platform configs.
---
(no changes since v1)
arch/arm/configs/multi_v7_defconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/configs/multi_v7_defconfig +3 -1
@@ -28,9 +28,11 @@ CONFIG_ARCH_BCM_21664=y CONFIG_ARCH_BCM_23550=y CONFIG_ARCH_BCM2835=y CONFIG_ARCH_BCM_53573=y -CONFIG_ARCH_BCM_63XX=y CONFIG_ARCH_BRCMSTB=y CONFIG_ARCH_BCMBCA=y +CONFIG_ARCH_BCMBCA_CORTEXA7=y +CONFIG_ARCH_BCMBCA_CORTEXA9=y +CONFIG_ARCH_BCMBCA_BRAHMAB15=y CONFIG_ARCH_BERLIN=y CONFIG_MACH_BERLIN_BG2=y CONFIG_MACH_BERLIN_BG2CD=y
Signature · 1 line
2.34.1
Florian Fainelli
AppliedRe: [PATCH v2 8/8] ARM: multi_v7_defconfig: Update configs for BCM63138
Quoted 5 lines · William Zhang
Remove
CONFIG_ARCH_BCM_63XXand add BCMBCA sub platform configs.Signed-off-by William Zhang <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/defconfig/next, thanks! --
Florian