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

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

[William Zhang]

[-- Attachment #1: Type: text/plain, Size: 1932 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.


William Zhang (9):
  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: Replace ARCH_BCM_63XX with ARCH_BCMBCA
  arm: bcmbca: Move BCM63138 ARCH_BCM_63XX config 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/Kconfig.debug                        |  2 +-
 arch/arm/boot/dts/Makefile                    |  4 +-
 arch/arm/boot/dts/bcm63138.dtsi               | 18 +++---
 arch/arm/boot/dts/bcm963138.dts               | 26 ++++++++
 arch/arm/boot/dts/bcm963138dvt.dts            |  8 +--
 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 ------
 drivers/ata/Kconfig                           |  2 +-
 drivers/char/hw_random/Kconfig                |  2 +-
 drivers/clk/bcm/Kconfig                       |  4 +-
 drivers/i2c/busses/Kconfig                    |  2 +-
 drivers/phy/broadcom/Kconfig                  |  2 +-
 drivers/spi/Kconfig                           |  2 +-
 drivers/tty/serial/Kconfig                    |  4 +-
 18 files changed, 108 insertions(+), 75 deletions(-)
 create mode 100644 arch/arm/boot/dts/bcm963138.dts
 delete mode 100644 arch/arm/mach-bcm/bcm63xx.c

-- 
2.34.1


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

[PATCH 1/9] dt-bindings: arm: add BCM63138 SoC

[William Zhang]

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

Add BCM63138 SoC device tree description to bcmbca binding document.

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

 .../devicetree/bindings/arm/bcm/brcm,bcmbca.yaml          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
index b817051c491d..d9dc4f22f4a5 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
@@ -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:
-- 
2.34.1


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

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

[William Zhang]

[-- Attachment #1: Type: text/plain, Size: 911 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>
---

 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 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138

[William Zhang]

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

Update compatible string and UART node and clock name based on device tree
binding documents.

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

 arch/arm/boot/dts/bcm63138.dtsi    | 18 +++++++++---------
 arch/arm/boot/dts/bcm963138dvt.dts |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
index cca49a2e2d62..bec13ed9f73b 100644
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -9,13 +9,13 @@
 / {
 	#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 {
-		uart0 = &serial0;
-		uart1 = &serial1;
+		serial0 = &uart0;
+		serial1 = &uart1;
 	};
 
 	cpus {
@@ -174,7 +174,7 @@ sata_phy0: sata-phy@0 {
 	};
 
 	/* Legacy UBUS base */
-	ubus@fffe8000 {
+	bus@fffe8000 {
 		compatible = "simple-bus";
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -185,21 +185,21 @@ timer: timer@80 {
 			reg = <0x80 0x3c>;
 		};
 
-		serial0: serial@600 {
+		uart0: serial@600 {
 			compatible = "brcm,bcm6345-uart";
 			reg = <0x600 0x1b>;
 			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&periph_clk>;
-			clock-names = "periph";
+			clock-names = "refclk";
 			status = "disabled";
 		};
 
-		serial1: serial@620 {
+		uart1: serial@620 {
 			compatible = "brcm,bcm6345-uart";
 			reg = <0x620 0x1b>;
 			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&periph_clk>;
-			clock-names = "periph";
+			clock-names = "refclk";
 			status = "disabled";
 		};
 
diff --git a/arch/arm/boot/dts/bcm963138dvt.dts b/arch/arm/boot/dts/bcm963138dvt.dts
index df5c8ab90627..3fe10c062ba4 100644
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -8,12 +8,12 @@
 #include "bcm63138.dtsi"
 
 / {
-	compatible = "brcm,BCM963138DVT", "brcm,bcm63138";
+	compatible = "brcm,BCM963138DVT", "brcm,bcm63138", "brcm,bcmbca";
 	model = "Broadcom BCM963138DVT";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
-		stdout-path = &serial0;
+		stdout-path = &uart0;
 	};
 
 	memory@0 {
@@ -23,11 +23,11 @@ memory@0 {
 
 };
 
-&serial0 {
+&uart0 {
 	status = "okay";
 };
 
-&serial1 {
+&uart1 {
 	status = "okay";
 };
 
-- 
2.34.1


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

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

[William Zhang]

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

Add generic bcm963138.dts file.

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

 arch/arm/boot/dts/Makefile      |  1 +
 arch/arm/boot/dts/bcm963138.dts | 26 ++++++++++++++++++++++++++
 2 files changed, 27 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..7d54cd14f8af
--- /dev/null
+++ b/arch/arm/boot/dts/bcm963138.dts
@@ -0,0 +1,26 @@
+// 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 {
+		stdout-path = "serial0:115200n8";
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x08000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
-- 
2.34.1


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

Re: [PATCH 1/9] dt-bindings: arm: add BCM63138 SoC

[Krzysztof Kozlowski]

On 05/07/2022 19:26, William Zhang wrote:
> Add BCM63138 SoC device tree description to bcmbca binding document.
> 
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---


Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>


Best regards,
Krzysztof

Re: [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138

[Krzysztof Kozlowski]

On 05/07/2022 19:26, William Zhang wrote:
> Update compatible string and UART node and clock name based on device tree
> binding documents.
> 
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
> 
>  arch/arm/boot/dts/bcm63138.dtsi    | 18 +++++++++---------
>  arch/arm/boot/dts/bcm963138dvt.dts |  8 ++++----
>  2 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
> index cca49a2e2d62..bec13ed9f73b 100644
> --- a/arch/arm/boot/dts/bcm63138.dtsi
> +++ b/arch/arm/boot/dts/bcm63138.dtsi
> @@ -9,13 +9,13 @@
>  / {
>  	#address-cells = <1>;
>  	#size-cells = <1>;
> -	compatible = "brcm,bcm63138";
> -	model = "Broadcom BCM63138 DSL SoC";
> +	compatible = "brcm,bcm63138", "brcm,bcmbca";

Changing compatibles affects ABI, so you should not combine it with some
node renaming/cleanup patch. Split these.

> +	model = "Broadcom BCM963138 Reference Board";
>  	interrupt-parent = <&gic>;
>  
>  	aliases {
> -		uart0 = &serial0;
> -		uart1 = &serial1;
> +		serial0 = &uart0;
> +		serial1 = &uart1;
>  	};
>  
>  	cpus {
> @@ -174,7 +174,7 @@ sata_phy0: sata-phy@0 {
>  	};
>  
>  	/* Legacy UBUS base */
> -	ubus@fffe8000 {
> +	bus@fffe8000 {
>  		compatible = "simple-bus";
>  		#address-cells = <1>;
>  		#size-cells = <1>;
> @@ -185,21 +185,21 @@ timer: timer@80 {
>  			reg = <0x80 0x3c>;
>  		};
>  
> -		serial0: serial@600 {
> +		uart0: serial@600 {
>  			compatible = "brcm,bcm6345-uart";
>  			reg = <0x600 0x1b>;
>  			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&periph_clk>;
> -			clock-names = "periph";
> +			clock-names = "refclk";
>  			status = "disabled";
>  		};
>  
> -		serial1: serial@620 {
> +		uart1: serial@620 {
>  			compatible = "brcm,bcm6345-uart";
>  			reg = <0x620 0x1b>;
>  			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
>  			clocks = <&periph_clk>;
> -			clock-names = "periph";
> +			clock-names = "refclk";

This is even more confusing. You now rename clock-names. How is this
related to board compatible or to node names?



Best regards,
Krzysztof

Re: [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138

[William Zhang]

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



On 7/6/22 00:54, Krzysztof Kozlowski wrote:
> On 05/07/2022 19:26, William Zhang wrote:
>> Update compatible string and UART node and clock name based on device tree
>> binding documents.
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> ---
>>
>>   arch/arm/boot/dts/bcm63138.dtsi    | 18 +++++++++---------
>>   arch/arm/boot/dts/bcm963138dvt.dts |  8 ++++----
>>   2 files changed, 13 insertions(+), 13 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/bcm63138.dtsi b/arch/arm/boot/dts/bcm63138.dtsi
>> index cca49a2e2d62..bec13ed9f73b 100644
>> --- a/arch/arm/boot/dts/bcm63138.dtsi
>> +++ b/arch/arm/boot/dts/bcm63138.dtsi
>> @@ -9,13 +9,13 @@
>>   / {
>>   	#address-cells = <1>;
>>   	#size-cells = <1>;
>> -	compatible = "brcm,bcm63138";
>> -	model = "Broadcom BCM63138 DSL SoC";
>> +	compatible = "brcm,bcm63138", "brcm,bcmbca";
> 
> Changing compatibles affects ABI, so you should not combine it with some
> node renaming/cleanup patch. Split these.
> 
>> +	model = "Broadcom BCM963138 Reference Board";
>>   	interrupt-parent = <&gic>;
>>   
>>   	aliases {
>> -		uart0 = &serial0;
>> -		uart1 = &serial1;
>> +		serial0 = &uart0;
>> +		serial1 = &uart1;
>>   	};
>>   
>>   	cpus {
>> @@ -174,7 +174,7 @@ sata_phy0: sata-phy@0 {
>>   	};
>>   
>>   	/* Legacy UBUS base */
>> -	ubus@fffe8000 {
>> +	bus@fffe8000 {
>>   		compatible = "simple-bus";
>>   		#address-cells = <1>;
>>   		#size-cells = <1>;
>> @@ -185,21 +185,21 @@ timer: timer@80 {
>>   			reg = <0x80 0x3c>;
>>   		};
>>   
>> -		serial0: serial@600 {
>> +		uart0: serial@600 {
>>   			compatible = "brcm,bcm6345-uart";
>>   			reg = <0x600 0x1b>;
>>   			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
>>   			clocks = <&periph_clk>;
>> -			clock-names = "periph";
>> +			clock-names = "refclk";
>>   			status = "disabled";
>>   		};
>>   
>> -		serial1: serial@620 {
>> +		uart1: serial@620 {
>>   			compatible = "brcm,bcm6345-uart";
>>   			reg = <0x620 0x1b>;
>>   			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
>>   			clocks = <&periph_clk>;
>> -			clock-names = "periph";
>> +			clock-names = "refclk";
> 
> This is even more confusing. You now rename clock-names. How is this
> related to board compatible or to node names?
Not related to board compatible string but it is the same board dts file 
that require some updates.  Anyway I don't have to change anything else 
other than the compatible string for this patchset.  So I will revert 
those changes.
> 
> 
> 
> Best regards,
> Krzysztof

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