[PATCH v2 0/8] arm: bcmbca: Move BCM63138 SoC support under ARCH_BCMBCA

[PATCH v2 0/8] arm: bcmbca: Move BCM63138 SoC support under ARCH_BCMBCA

[William Zhang]

[-- Attachment #1: Type: text/plain, Size: 1687 bytes --]

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
-- 
2.34.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

[PATCH v2 2/8] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA

[William Zhang]

[-- Attachment #1: Type: text/plain, Size: 934 bytes --]

Use CONFIG_ARCH_BCMBCA to build all the BCMBCA SoC dts and remove
CONFIG_ARCH_BCM_63XX from the makefile

Signed-off-by: William Zhang <william.zhang@broadcom.com>
---

(no changes since v1)

 arch/arm/boot/dts/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 38d9c60aece7..1bf8e2f8ee68 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
-- 
2.34.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

[PATCH v2 4/8] ARM: dts: Add BCM63138 generic board dts

[William Zhang]

[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]

Add generic bcm963138.dts file.

Signed-off-by: William Zhang <william.zhang@broadcom.com>
---

(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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 1bf8e2f8ee68..d2b64aaf2874 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/bcm963138.dts b/arch/arm/boot/dts/bcm963138.dts
new file mode 100644
index 000000000000..d28c4f130ca2
--- /dev/null
+++ b/arch/arm/boot/dts/bcm963138.dts
@@ -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";
+};
-- 
2.34.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]

Re: [PATCH v2 2/8] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA

[Florian Fainelli]

On Thu,  7 Jul 2022 00:00:32 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> Use CONFIG_ARCH_BCMBCA to build all the BCMBCA SoC dts and remove
> CONFIG_ARCH_BCM_63XX from the makefile
> 
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian

Re: [PATCH v2 4/8] ARM: dts: Add BCM63138 generic board dts

[Florian Fainelli]

On Thu,  7 Jul 2022 00:00:34 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> Add generic bcm963138.dts file.
> 
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---

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

[Rafał Miłecki]

On 7.07.2022 09:00, William Zhang wrote:
> Use CONFIG_ARCH_BCMBCA to build all the BCMBCA SoC dts and remove
> CONFIG_ARCH_BCM_63XX from the makefile
> 
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
> 
> (no changes since v1)
> 
>   arch/arm/boot/dts/Makefile | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 38d9c60aece7..1bf8e2f8ee68 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -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 \

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

[Florian Fainelli]

On 7/13/22 08:26, Rafał Miłecki wrote:
> On 7.07.2022 09:00, William Zhang wrote:
>> Use CONFIG_ARCH_BCMBCA to build all the BCMBCA SoC dts and remove
>> CONFIG_ARCH_BCM_63XX from the makefile
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> ---
>>
>> (no changes since v1)
>>
>>   arch/arm/boot/dts/Makefile | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 38d9c60aece7..1bf8e2f8ee68 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -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 \
> 
> 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.

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