* [PATCH 0/9] arm: bcmbca: Move BCM63138 SoC support under ARCH_BCMBCA
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Al Cooper, Andre Przywara, Andy Shevchenko,
Ard Biesheuvel, Arnd Bergmann, Cai Huoqing, Conor Dooley,
Damien Le Moal, Dmitry Osipenko, Eugen Hristev,
Geert Uytterhoeven, Greg Kroah-Hartman, Herbert Xu, Jan Dabros,
Jarkko Nikula, Jie Deng, Jiri Slaby, Joel Stanley,
Kavyasree Kotagiri, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Krzysztof Kozlowski, Lukas Bulwahn, Mark Brown, Matt Mackall,
Michael Turquette, Michael Walle, Nathan Chancellor,
Nicolas Ferre, Olof Johansson, Rafał Miłecki, Ray Jui,
Rob Herring, Rob Herring, Russell King, Sam Protsenko,
Scott Branden, Stephan Gerhold, Stephen Boyd, Sunil Goutham,
Sven Peter, Thierry Reding, Thomas Bogendoerfer, Tyrone Ting,
Vinod Koul, Wolfram Sang, devicetree, linux-clk, linux-crypto,
linux-i2c, linux-ide, linux-kernel, linux-phy, linux-serial,
linux-spi, soc
[-- Attachment #1.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 #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 112 bytes --]
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 0/9] arm: bcmbca: Move BCM63138 SoC support under ARCH_BCMBCA
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Al Cooper, Andre Przywara, Andy Shevchenko,
Ard Biesheuvel, Arnd Bergmann, Cai Huoqing, Conor Dooley,
Damien Le Moal, Dmitry Osipenko, Eugen Hristev,
Geert Uytterhoeven, Greg Kroah-Hartman, Herbert Xu, Jan Dabros,
Jarkko Nikula, Jie Deng, Jiri Slaby, Joel Stanley,
Kavyasree Kotagiri, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Krzysztof Kozlowski, Lukas Bulwahn, Mark Brown, Matt Mackall,
Michael Turquette, Michael Walle, Nathan Chancellor,
Nicolas Ferre, Olof Johansson, Rafał Miłecki, Ray Jui,
Rob Herring, Rob Herring, Russell King, Sam Protsenko,
Scott Branden, Stephan Gerhold, Stephen Boyd, Sunil Goutham,
Sven Peter, Thierry Reding, Thomas Bogendoerfer, Tyrone Ting,
Vinod Koul, Wolfram Sang, devicetree, linux-clk, linux-crypto,
linux-i2c, linux-ide, linux-kernel, linux-phy, linux-serial,
linux-spi, soc
[-- 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 --]
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 1/9] dt-bindings: arm: add BCM63138 SoC
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- 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 --]
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 1/9] dt-bindings: arm: add BCM63138 SoC
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- Attachment #1.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 #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [PATCH 1/9] dt-bindings: arm: add BCM63138 SoC
2022-07-05 17:26 ` William Zhang
@ 2022-07-06 7:53 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 33+ messages in thread
From: Krzysztof Kozlowski @ 2022-07-06 7:53 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel
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
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 1/9] dt-bindings: arm: add BCM63138 SoC
@ 2022-07-06 7:53 ` Krzysztof Kozlowski
0 siblings, 0 replies; 33+ messages in thread
From: Krzysztof Kozlowski @ 2022-07-06 7:53 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 2/9] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Arnd Bergmann, Krzysztof Kozlowski,
Olof Johansson, Rob Herring, devicetree, linux-kernel, soc
[-- 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 --]
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 2/9] ARM: dts: Move BCM963138DVT board dts to ARCH_BCMBCA
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Arnd Bergmann, Krzysztof Kozlowski,
Olof Johansson, Rob Herring, devicetree, linux-kernel, soc
[-- Attachment #1.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 #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- 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 --]
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- Attachment #1.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 #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread* Re: [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138
2022-07-05 17:26 ` William Zhang
@ 2022-07-06 7:54 ` Krzysztof Kozlowski
-1 siblings, 0 replies; 33+ messages in thread
From: Krzysztof Kozlowski @ 2022-07-06 7:54 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel
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
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138
@ 2022-07-06 7:54 ` Krzysztof Kozlowski
0 siblings, 0 replies; 33+ messages in thread
From: Krzysztof Kozlowski @ 2022-07-06 7:54 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138
2022-07-06 7:54 ` Krzysztof Kozlowski
@ 2022-07-06 22:07 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-06 22:07 UTC (permalink / raw)
To: Krzysztof Kozlowski, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel
[-- 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 --]
^ permalink raw reply [flat|nested] 33+ messages in thread* Re: [PATCH 3/9] ARM: dts: update dts files for bcmbca SoC BCM63138
@ 2022-07-06 22:07 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-06 22:07 UTC (permalink / raw)
To: Krzysztof Kozlowski, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
Krzysztof Kozlowski, Rob Herring, devicetree, linux-kernel
[-- Attachment #1.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 #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 4/9] ARM: dts: Add BCM63138 generic board dts
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Arnd Bergmann, Krzysztof Kozlowski,
Olof Johansson, Rob Herring, devicetree, linux-kernel, soc
[-- 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 --]
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 4/9] ARM: dts: Add BCM63138 generic board dts
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Arnd Bergmann, Krzysztof Kozlowski,
Olof Johansson, Rob Herring, devicetree, linux-kernel, soc
[-- Attachment #1.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 #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Al Cooper, Andre Przywara, Andy Shevchenko,
Ard Biesheuvel, Arnd Bergmann, Cai Huoqing, Conor Dooley,
Damien Le Moal, Eugen Hristev, Geert Uytterhoeven,
Greg Kroah-Hartman, Herbert Xu, Jan Dabros, Jarkko Nikula,
Jie Deng, Jiri Slaby, Kavyasree Kotagiri, Kishon Vijay Abraham I,
Krzysztof Kozlowski, Lukas Bulwahn, Mark Brown, Matt Mackall,
Michael Turquette, Nathan Chancellor, Nicolas Ferre,
Rafał Miłecki, Rob Herring, Russell King,
Sam Protsenko, Stephen Boyd, Sunil Goutham, Sven Peter,
Thomas Bogendoerfer, Tyrone Ting, Vinod Koul, Wolfram Sang,
linux-clk, linux-crypto, linux-i2c, linux-ide, linux-kernel,
linux-phy, linux-serial, linux-spi
[-- Attachment #1: Type: text/plain, Size: 4728 bytes --]
Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/Kconfig.debug | 2 +-
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 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9b0aa4822d69..792796a348c3 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -271,7 +271,7 @@ choice
config DEBUG_BCM63XX_UART
bool "Kernel low-level debugging on BCM63XX UART"
- depends on ARCH_BCM_63XX
+ depends on ARCH_BCMBCA
config DEBUG_BERLIN_UART
bool "Marvell Berlin SoC Debug UART"
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index bb45a9c00514..1c9f4fb2595d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -148,7 +148,7 @@ config SATA_AHCI_PLATFORM
config AHCI_BRCM
tristate "Broadcom AHCI SATA support"
depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \
- ARCH_BCM_63XX || COMPILE_TEST
+ ARCH_BCMBCA || COMPILE_TEST
select SATA_HOST
help
This option enables support for the AHCI SATA3 controller found on
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index b3f2d55dc551..3da8e85f8aae 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -87,7 +87,7 @@ config HW_RANDOM_BA431
config HW_RANDOM_BCM2835
tristate "Broadcom BCM2835/BCM63xx Random Number Generator support"
depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \
- ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+ ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
default HW_RANDOM
help
This driver provides kernel-side support for the Random Number
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
index ec738f74a026..77266afb1c79 100644
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@ -22,9 +22,9 @@ config CLK_BCM2835
config CLK_BCM_63XX
bool "Broadcom BCM63xx clock support"
- depends on ARCH_BCM_63XX || COMPILE_TEST
+ depends on ARCH_BCMBCA || COMPILE_TEST
select COMMON_CLK_IPROC
- default ARCH_BCM_63XX
+ default ARCH_BCMBCA
help
Enable common clock framework support for Broadcom BCM63xx DSL SoCs
based on the ARM architecture
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b1d7069dd377..acf2a393bd56 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -486,7 +486,7 @@ config I2C_BCM_KONA
config I2C_BRCMSTB
tristate "BRCM Settop/DSL I2C controller"
- depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCM_63XX || \
+ depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
default y
help
diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
index 849c4204f550..93a6a8ee4716 100644
--- a/drivers/phy/broadcom/Kconfig
+++ b/drivers/phy/broadcom/Kconfig
@@ -83,7 +83,7 @@ config PHY_NS2_USB_DRD
config PHY_BRCM_SATA
tristate "Broadcom SATA PHY driver"
depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || \
- ARCH_BCM_63XX || COMPILE_TEST
+ ARCH_BCMBCA || COMPILE_TEST
depends on OF
select GENERIC_PHY
default ARCH_BCM_IPROC
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 2d034459e79f..8e550269d488 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -183,7 +183,7 @@ config SPI_BCM63XX
config SPI_BCM63XX_HSSPI
tristate "Broadcom BCM63XX HS SPI controller driver"
- depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST
+ depends on BCM63XX || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST
help
This enables support for the High Speed SPI controller present on
newer Broadcom BCM63XX SoCs.
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 8a3ee1525d80..e3279544b03c 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_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
- default ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
+ depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+ default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
help
This enables the driver for the onchip UART core found on
the following chipsets:
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Al Cooper, Andre Przywara, Andy Shevchenko,
Ard Biesheuvel, Arnd Bergmann, Cai Huoqing, Conor Dooley,
Damien Le Moal, Eugen Hristev, Geert Uytterhoeven,
Greg Kroah-Hartman, Herbert Xu, Jan Dabros, Jarkko Nikula,
Jie Deng, Jiri Slaby, Kavyasree Kotagiri, Kishon Vijay Abraham I,
Krzysztof Kozlowski, Lukas Bulwahn, Mark Brown, Matt Mackall,
Michael Turquette, Nathan Chancellor, Nicolas Ferre,
Rafał Miłecki, Rob Herring, Russell King,
Sam Protsenko, Stephen Boyd, Sunil Goutham, Sven Peter,
Thomas Bogendoerfer, Tyrone Ting, Vinod Koul, Wolfram Sang,
linux-clk, linux-crypto, linux-i2c, linux-ide, linux-kernel,
linux-phy, linux-serial, linux-spi
[-- Attachment #1.1: Type: text/plain, Size: 4728 bytes --]
Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/Kconfig.debug | 2 +-
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 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 9b0aa4822d69..792796a348c3 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -271,7 +271,7 @@ choice
config DEBUG_BCM63XX_UART
bool "Kernel low-level debugging on BCM63XX UART"
- depends on ARCH_BCM_63XX
+ depends on ARCH_BCMBCA
config DEBUG_BERLIN_UART
bool "Marvell Berlin SoC Debug UART"
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index bb45a9c00514..1c9f4fb2595d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -148,7 +148,7 @@ config SATA_AHCI_PLATFORM
config AHCI_BRCM
tristate "Broadcom AHCI SATA support"
depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \
- ARCH_BCM_63XX || COMPILE_TEST
+ ARCH_BCMBCA || COMPILE_TEST
select SATA_HOST
help
This option enables support for the AHCI SATA3 controller found on
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index b3f2d55dc551..3da8e85f8aae 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -87,7 +87,7 @@ config HW_RANDOM_BA431
config HW_RANDOM_BCM2835
tristate "Broadcom BCM2835/BCM63xx Random Number Generator support"
depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \
- ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+ ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
default HW_RANDOM
help
This driver provides kernel-side support for the Random Number
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
index ec738f74a026..77266afb1c79 100644
--- a/drivers/clk/bcm/Kconfig
+++ b/drivers/clk/bcm/Kconfig
@@ -22,9 +22,9 @@ config CLK_BCM2835
config CLK_BCM_63XX
bool "Broadcom BCM63xx clock support"
- depends on ARCH_BCM_63XX || COMPILE_TEST
+ depends on ARCH_BCMBCA || COMPILE_TEST
select COMMON_CLK_IPROC
- default ARCH_BCM_63XX
+ default ARCH_BCMBCA
help
Enable common clock framework support for Broadcom BCM63xx DSL SoCs
based on the ARM architecture
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b1d7069dd377..acf2a393bd56 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -486,7 +486,7 @@ config I2C_BCM_KONA
config I2C_BRCMSTB
tristate "BRCM Settop/DSL I2C controller"
- depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCM_63XX || \
+ depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
default y
help
diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
index 849c4204f550..93a6a8ee4716 100644
--- a/drivers/phy/broadcom/Kconfig
+++ b/drivers/phy/broadcom/Kconfig
@@ -83,7 +83,7 @@ config PHY_NS2_USB_DRD
config PHY_BRCM_SATA
tristate "Broadcom SATA PHY driver"
depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || \
- ARCH_BCM_63XX || COMPILE_TEST
+ ARCH_BCMBCA || COMPILE_TEST
depends on OF
select GENERIC_PHY
default ARCH_BCM_IPROC
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 2d034459e79f..8e550269d488 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -183,7 +183,7 @@ config SPI_BCM63XX
config SPI_BCM63XX_HSSPI
tristate "Broadcom BCM63XX HS SPI controller driver"
- depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST
+ depends on BCM63XX || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST
help
This enables support for the High Speed SPI controller present on
newer Broadcom BCM63XX SoCs.
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 8a3ee1525d80..e3279544b03c 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_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
- default ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
+ depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
+ default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
help
This enables the driver for the onchip UART core found on
the following chipsets:
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 112 bytes --]
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 19:10 ` Wolfram Sang
-1 siblings, 0 replies; 33+ messages in thread
From: Wolfram Sang @ 2022-07-05 19:10 UTC (permalink / raw)
To: William Zhang
Cc: Linux ARM List, joel.peshkin, kursad.oney, f.fainelli,
anand.gore, Broadcom Kernel List, philippe.reynes, dan.beygelman,
Al Cooper, Andre Przywara, Andy Shevchenko, Ard Biesheuvel,
Arnd Bergmann, Cai Huoqing, Conor Dooley, Damien Le Moal,
Eugen Hristev, Geert Uytterhoeven, Greg Kroah-Hartman,
Herbert Xu, Jan Dabros, Jarkko Nikula, Jie Deng, Jiri Slaby,
Kavyasree Kotagiri, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Lukas Bulwahn, Mark Brown, Matt Mackall, Michael Turquette,
Nathan Chancellor, Nicolas Ferre, Rafał Miłecki,
Rob Herring, Russell King, Sam Protsenko, Stephen Boyd,
Sunil Goutham, Sven Peter, Thomas Bogendoerfer, Tyrone Ting,
Vinod Koul, linux-clk, linux-crypto, linux-i2c, linux-ide,
linux-kernel, linux-phy, linux-serial, linux-spi
On Tue, Jul 05, 2022 at 10:26:09AM -0700, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Wolfram Sang <wsa@kernel.org> # for I2C
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
@ 2022-07-05 19:10 ` Wolfram Sang
0 siblings, 0 replies; 33+ messages in thread
From: Wolfram Sang @ 2022-07-05 19:10 UTC (permalink / raw)
To: William Zhang
Cc: Linux ARM List, joel.peshkin, kursad.oney, f.fainelli,
anand.gore, Broadcom Kernel List, philippe.reynes, dan.beygelman,
Al Cooper, Andre Przywara, Andy Shevchenko, Ard Biesheuvel,
Arnd Bergmann, Cai Huoqing, Conor Dooley, Damien Le Moal,
Eugen Hristev, Geert Uytterhoeven, Greg Kroah-Hartman,
Herbert Xu, Jan Dabros, Jarkko Nikula, Jie Deng, Jiri Slaby,
Kavyasree Kotagiri, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Lukas Bulwahn, Mark Brown, Matt Mackall, Michael Turquette,
Nathan Chancellor, Nicolas Ferre, Rafał Miłecki,
Rob Herring, Russell King, Sam Protsenko, Stephen Boyd,
Sunil Goutham, Sven Peter, Thomas Bogendoerfer, Tyrone Ting,
Vinod Koul, linux-clk, linux-crypto, linux-i2c, linux-ide,
linux-kernel, linux-phy, linux-serial, linux-spi
On Tue, Jul 05, 2022 at 10:26:09AM -0700, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Wolfram Sang <wsa@kernel.org> # for I2C
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
2022-07-05 17:26 ` William Zhang
@ 2022-07-06 3:45 ` Damien Le Moal
-1 siblings, 0 replies; 33+ messages in thread
From: Damien Le Moal @ 2022-07-06 3:45 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman, Al Cooper,
Andre Przywara, Andy Shevchenko, Ard Biesheuvel, Arnd Bergmann,
Cai Huoqing, Conor Dooley, Eugen Hristev, Geert Uytterhoeven,
Greg Kroah-Hartman, Herbert Xu, Jan Dabros, Jarkko Nikula,
Jie Deng, Jiri Slaby, Kavyasree Kotagiri, Kishon Vijay Abraham I,
Krzysztof Kozlowski, Lukas Bulwahn, Mark Brown, Matt Mackall,
Michael Turquette, Nathan Chancellor, Nicolas Ferre,
Rafał Miłecki, Rob Herring, Russell King,
Sam Protsenko, Stephen Boyd, Sunil Goutham, Sven Peter,
Thomas Bogendoerfer, Tyrone Ting, Vinod Koul, Wolfram Sang,
linux-clk, linux-crypto, linux-i2c, linux-ide, linux-kernel,
linux-phy, linux-serial, linux-spi
On 7/6/22 02:26, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
For the ata Kconfig change:
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
> ---
>
> arch/arm/Kconfig.debug | 2 +-
> 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 ++--
> 8 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9b0aa4822d69..792796a348c3 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -271,7 +271,7 @@ choice
>
> config DEBUG_BCM63XX_UART
> bool "Kernel low-level debugging on BCM63XX UART"
> - depends on ARCH_BCM_63XX
> + depends on ARCH_BCMBCA
>
> config DEBUG_BERLIN_UART
> bool "Marvell Berlin SoC Debug UART"
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index bb45a9c00514..1c9f4fb2595d 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -148,7 +148,7 @@ config SATA_AHCI_PLATFORM
> config AHCI_BRCM
> tristate "Broadcom AHCI SATA support"
> depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \
> - ARCH_BCM_63XX || COMPILE_TEST
> + ARCH_BCMBCA || COMPILE_TEST
> select SATA_HOST
> help
> This option enables support for the AHCI SATA3 controller found on
> diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
> index b3f2d55dc551..3da8e85f8aae 100644
> --- a/drivers/char/hw_random/Kconfig
> +++ b/drivers/char/hw_random/Kconfig
> @@ -87,7 +87,7 @@ config HW_RANDOM_BA431
> config HW_RANDOM_BCM2835
> tristate "Broadcom BCM2835/BCM63xx Random Number Generator support"
> depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \
> - ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> + ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> default HW_RANDOM
> help
> This driver provides kernel-side support for the Random Number
> diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
> index ec738f74a026..77266afb1c79 100644
> --- a/drivers/clk/bcm/Kconfig
> +++ b/drivers/clk/bcm/Kconfig
> @@ -22,9 +22,9 @@ config CLK_BCM2835
>
> config CLK_BCM_63XX
> bool "Broadcom BCM63xx clock support"
> - depends on ARCH_BCM_63XX || COMPILE_TEST
> + depends on ARCH_BCMBCA || COMPILE_TEST
> select COMMON_CLK_IPROC
> - default ARCH_BCM_63XX
> + default ARCH_BCMBCA
> help
> Enable common clock framework support for Broadcom BCM63xx DSL SoCs
> based on the ARM architecture
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index b1d7069dd377..acf2a393bd56 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -486,7 +486,7 @@ config I2C_BCM_KONA
>
> config I2C_BRCMSTB
> tristate "BRCM Settop/DSL I2C controller"
> - depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCM_63XX || \
> + depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
> ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
> default y
> help
> diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
> index 849c4204f550..93a6a8ee4716 100644
> --- a/drivers/phy/broadcom/Kconfig
> +++ b/drivers/phy/broadcom/Kconfig
> @@ -83,7 +83,7 @@ config PHY_NS2_USB_DRD
> config PHY_BRCM_SATA
> tristate "Broadcom SATA PHY driver"
> depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || \
> - ARCH_BCM_63XX || COMPILE_TEST
> + ARCH_BCMBCA || COMPILE_TEST
> depends on OF
> select GENERIC_PHY
> default ARCH_BCM_IPROC
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 2d034459e79f..8e550269d488 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -183,7 +183,7 @@ config SPI_BCM63XX
>
> config SPI_BCM63XX_HSSPI
> tristate "Broadcom BCM63XX HS SPI controller driver"
> - depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST
> + depends on BCM63XX || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST
> help
> This enables support for the High Speed SPI controller present on
> newer Broadcom BCM63XX SoCs.
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 8a3ee1525d80..e3279544b03c 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_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> - default ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
> + depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> + default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
> help
> This enables the driver for the onchip UART core found on
> the following chipsets:
--
Damien Le Moal
Western Digital Research
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
@ 2022-07-06 3:45 ` Damien Le Moal
0 siblings, 0 replies; 33+ messages in thread
From: Damien Le Moal @ 2022-07-06 3:45 UTC (permalink / raw)
To: William Zhang, Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman, Al Cooper,
Andre Przywara, Andy Shevchenko, Ard Biesheuvel, Arnd Bergmann,
Cai Huoqing, Conor Dooley, Eugen Hristev, Geert Uytterhoeven,
Greg Kroah-Hartman, Herbert Xu, Jan Dabros, Jarkko Nikula,
Jie Deng, Jiri Slaby, Kavyasree Kotagiri, Kishon Vijay Abraham I,
Krzysztof Kozlowski, Lukas Bulwahn, Mark Brown, Matt Mackall,
Michael Turquette, Nathan Chancellor, Nicolas Ferre,
Rafał Miłecki, Rob Herring, Russell King,
Sam Protsenko, Stephen Boyd, Sunil Goutham, Sven Peter,
Thomas Bogendoerfer, Tyrone Ting, Vinod Koul, Wolfram Sang,
linux-clk, linux-crypto, linux-i2c, linux-ide, linux-kernel,
linux-phy, linux-serial, linux-spi
On 7/6/22 02:26, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
For the ata Kconfig change:
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
> ---
>
> arch/arm/Kconfig.debug | 2 +-
> 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 ++--
> 8 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
> index 9b0aa4822d69..792796a348c3 100644
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@ -271,7 +271,7 @@ choice
>
> config DEBUG_BCM63XX_UART
> bool "Kernel low-level debugging on BCM63XX UART"
> - depends on ARCH_BCM_63XX
> + depends on ARCH_BCMBCA
>
> config DEBUG_BERLIN_UART
> bool "Marvell Berlin SoC Debug UART"
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index bb45a9c00514..1c9f4fb2595d 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -148,7 +148,7 @@ config SATA_AHCI_PLATFORM
> config AHCI_BRCM
> tristate "Broadcom AHCI SATA support"
> depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCM_NSP || \
> - ARCH_BCM_63XX || COMPILE_TEST
> + ARCH_BCMBCA || COMPILE_TEST
> select SATA_HOST
> help
> This option enables support for the AHCI SATA3 controller found on
> diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
> index b3f2d55dc551..3da8e85f8aae 100644
> --- a/drivers/char/hw_random/Kconfig
> +++ b/drivers/char/hw_random/Kconfig
> @@ -87,7 +87,7 @@ config HW_RANDOM_BA431
> config HW_RANDOM_BCM2835
> tristate "Broadcom BCM2835/BCM63xx Random Number Generator support"
> depends on ARCH_BCM2835 || ARCH_BCM_NSP || ARCH_BCM_5301X || \
> - ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> + ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> default HW_RANDOM
> help
> This driver provides kernel-side support for the Random Number
> diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
> index ec738f74a026..77266afb1c79 100644
> --- a/drivers/clk/bcm/Kconfig
> +++ b/drivers/clk/bcm/Kconfig
> @@ -22,9 +22,9 @@ config CLK_BCM2835
>
> config CLK_BCM_63XX
> bool "Broadcom BCM63xx clock support"
> - depends on ARCH_BCM_63XX || COMPILE_TEST
> + depends on ARCH_BCMBCA || COMPILE_TEST
> select COMMON_CLK_IPROC
> - default ARCH_BCM_63XX
> + default ARCH_BCMBCA
> help
> Enable common clock framework support for Broadcom BCM63xx DSL SoCs
> based on the ARM architecture
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index b1d7069dd377..acf2a393bd56 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -486,7 +486,7 @@ config I2C_BCM_KONA
>
> config I2C_BRCMSTB
> tristate "BRCM Settop/DSL I2C controller"
> - depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCM_63XX || \
> + depends on ARCH_BCM2835 || ARCH_BCM4908 || ARCH_BCMBCA || \
> ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST
> default y
> help
> diff --git a/drivers/phy/broadcom/Kconfig b/drivers/phy/broadcom/Kconfig
> index 849c4204f550..93a6a8ee4716 100644
> --- a/drivers/phy/broadcom/Kconfig
> +++ b/drivers/phy/broadcom/Kconfig
> @@ -83,7 +83,7 @@ config PHY_NS2_USB_DRD
> config PHY_BRCM_SATA
> tristate "Broadcom SATA PHY driver"
> depends on ARCH_BRCMSTB || ARCH_BCM_IPROC || BMIPS_GENERIC || \
> - ARCH_BCM_63XX || COMPILE_TEST
> + ARCH_BCMBCA || COMPILE_TEST
> depends on OF
> select GENERIC_PHY
> default ARCH_BCM_IPROC
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 2d034459e79f..8e550269d488 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -183,7 +183,7 @@ config SPI_BCM63XX
>
> config SPI_BCM63XX_HSSPI
> tristate "Broadcom BCM63XX HS SPI controller driver"
> - depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST
> + depends on BCM63XX || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST
> help
> This enables support for the High Speed SPI controller present on
> newer Broadcom BCM63XX SoCs.
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 8a3ee1525d80..e3279544b03c 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_BCM_63XX || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> - default ARCH_BCM4908 || ARCH_BCM_63XX || BCM63XX || BMIPS_GENERIC
> + depends on ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC || COMPILE_TEST
> + default ARCH_BCM4908 || ARCH_BCMBCA || BCM63XX || BMIPS_GENERIC
> help
> This enables the driver for the onchip UART core found on
> the following chipsets:
--
Damien Le Moal
Western Digital Research
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
2022-07-05 17:26 ` William Zhang
@ 2022-07-06 16:52 ` Vinod Koul
-1 siblings, 0 replies; 33+ messages in thread
From: Vinod Koul @ 2022-07-06 16:52 UTC (permalink / raw)
To: William Zhang
Cc: Linux ARM List, joel.peshkin, kursad.oney, f.fainelli,
anand.gore, Broadcom Kernel List, philippe.reynes, dan.beygelman,
Al Cooper, Andre Przywara, Andy Shevchenko, Ard Biesheuvel,
Arnd Bergmann, Cai Huoqing, Conor Dooley, Damien Le Moal,
Eugen Hristev, Geert Uytterhoeven, Greg Kroah-Hartman,
Herbert Xu, Jan Dabros, Jarkko Nikula, Jie Deng, Jiri Slaby,
Kavyasree Kotagiri, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Lukas Bulwahn, Mark Brown, Matt Mackall, Michael Turquette,
Nathan Chancellor, Nicolas Ferre, Rafał Miłecki,
Rob Herring, Russell King, Sam Protsenko, Stephen Boyd,
Sunil Goutham, Sven Peter, Thomas Bogendoerfer, Tyrone Ting,
Wolfram Sang, linux-clk, linux-crypto, linux-i2c, linux-ide,
linux-kernel, linux-phy, linux-serial, linux-spi
On 05-07-22, 10:26, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> arch/arm/Kconfig.debug | 2 +-
> 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 +-
Acked-By: Vinod Koul <vkoul@kernel.org>
--
~Vinod
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH 5/9] arm: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA
@ 2022-07-06 16:52 ` Vinod Koul
0 siblings, 0 replies; 33+ messages in thread
From: Vinod Koul @ 2022-07-06 16:52 UTC (permalink / raw)
To: William Zhang
Cc: Linux ARM List, joel.peshkin, kursad.oney, f.fainelli,
anand.gore, Broadcom Kernel List, philippe.reynes, dan.beygelman,
Al Cooper, Andre Przywara, Andy Shevchenko, Ard Biesheuvel,
Arnd Bergmann, Cai Huoqing, Conor Dooley, Damien Le Moal,
Eugen Hristev, Geert Uytterhoeven, Greg Kroah-Hartman,
Herbert Xu, Jan Dabros, Jarkko Nikula, Jie Deng, Jiri Slaby,
Kavyasree Kotagiri, Kishon Vijay Abraham I, Krzysztof Kozlowski,
Lukas Bulwahn, Mark Brown, Matt Mackall, Michael Turquette,
Nathan Chancellor, Nicolas Ferre, Rafał Miłecki,
Rob Herring, Russell King, Sam Protsenko, Stephen Boyd,
Sunil Goutham, Sven Peter, Thomas Bogendoerfer, Tyrone Ting,
Wolfram Sang, linux-clk, linux-crypto, linux-i2c, linux-ide,
linux-kernel, linux-phy, linux-serial, linux-spi
On 05-07-22, 10:26, William Zhang wrote:
> Update ARCH_BCM_63XX in all sources to use ARCHB_BCMBCA instead.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---
>
> arch/arm/Kconfig.debug | 2 +-
> 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 +-
Acked-By: Vinod Koul <vkoul@kernel.org>
--
~Vinod
--
linux-phy mailing list
linux-phy@lists.infradead.org
https://lists.infradead.org/mailman/listinfo/linux-phy
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH 6/9] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX config to ARCH_BCMBCA
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Ray Jui, Russell King, Scott Branden,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3110 bytes --]
Remove ARCH_BCM_63XX for BCM63138 and move it to ARCH_BCMBCA. Delete
bcm63xx.c as it is no longer needed.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
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
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index f73a056bf560..25aa4ef4db07 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -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
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 284ea2f8cbc2..25347d7049b8 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -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
diff --git a/arch/arm/mach-bcm/bcm63xx.c b/arch/arm/mach-bcm/bcm63xx.c
deleted file mode 100644
index f855e361dfba..000000000000
--- a/arch/arm/mach-bcm/bcm63xx.c
+++ /dev/null
@@ -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
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 33+ messages in thread* [PATCH 6/9] arm: bcmbca: Move BCM63138 ARCH_BCM_63XX config to ARCH_BCMBCA
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Ray Jui, Russell King, Scott Branden,
linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 3110 bytes --]
Remove ARCH_BCM_63XX for BCM63138 and move it to ARCH_BCMBCA. Delete
bcm63xx.c as it is no longer needed.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
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
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index f73a056bf560..25aa4ef4db07 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -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
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 284ea2f8cbc2..25347d7049b8 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -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
diff --git a/arch/arm/mach-bcm/bcm63xx.c b/arch/arm/mach-bcm/bcm63xx.c
deleted file mode 100644
index f855e361dfba..000000000000
--- a/arch/arm/mach-bcm/bcm63xx.c
+++ /dev/null
@@ -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
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 7/9] arm: bcmbca: Add BCMBCA sub platforms
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Ray Jui, Russell King, Scott Branden,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2438 bytes --]
Create new CORTEXA7, CORTEXA9 and BRAHMAB15 BCMBCA sub platform configs to
enable fine-grained selection for each type of ARMv7 SoC.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/mach-bcm/Kconfig | 45 +++++++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 25aa4ef4db07..0cd23e549cdd 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -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
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 7/9] arm: bcmbca: Add BCMBCA sub platforms
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Ray Jui, Russell King, Scott Branden,
linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 2438 bytes --]
Create new CORTEXA7, CORTEXA9 and BRAHMAB15 BCMBCA sub platform configs to
enable fine-grained selection for each type of ARMv7 SoC.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/mach-bcm/Kconfig | 45 +++++++++++++++++++++++++++++++++------
1 file changed, 39 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index 25aa4ef4db07..0cd23e549cdd 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -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
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 8/9] MAINTAINERS: Move BCM63138 to bcmbca arch entry
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1474 bytes --]
Move BCM63138 related files to BCMBCA ARCH maintainer list entry and delete
the BCM63XX ARM ARCHITECTURE entry
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
MAINTAINERS | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7ffcc1142c5f..1854a885165a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3898,6 +3898,7 @@ BROADCOM BCMBCA ARM ARCHITECTURE
M: William Zhang <william.zhang@broadcom.com>
M: Anand Gore <anand.gore@broadcom.com>
M: Kursad Oney <kursad.oney@broadcom.com>
+M: Florian Fainelli <f.fainelli@gmail.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
L: linux-arm-kernel@lists.infradead.org (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 <f.fainelli@gmail.com>
-R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-T: git git://github.com/broadcom/stblinux.git
-N: bcm63xx
-
BROADCOM BCM63XX/BCM33XX UDC DRIVER
M: Kevin Cernekee <cernekee@gmail.com>
L: linux-usb@vger.kernel.org
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 8/9] MAINTAINERS: Move BCM63138 to bcmbca arch entry
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 1474 bytes --]
Move BCM63138 related files to BCMBCA ARCH maintainer list entry and delete
the BCM63XX ARM ARCHITECTURE entry
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
MAINTAINERS | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7ffcc1142c5f..1854a885165a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3898,6 +3898,7 @@ BROADCOM BCMBCA ARM ARCHITECTURE
M: William Zhang <william.zhang@broadcom.com>
M: Anand Gore <anand.gore@broadcom.com>
M: Kursad Oney <kursad.oney@broadcom.com>
+M: Florian Fainelli <f.fainelli@gmail.com>
R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
L: linux-arm-kernel@lists.infradead.org (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 <f.fainelli@gmail.com>
-R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>
-L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S: Maintained
-T: git git://github.com/broadcom/stblinux.git
-N: bcm63xx
-
BROADCOM BCM63XX/BCM33XX UDC DRIVER
M: Kevin Cernekee <cernekee@gmail.com>
L: linux-usb@vger.kernel.org
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 9/9] ARM: multi_v7_defconfig: Update configs for BCM63138
2022-07-05 17:26 ` William Zhang
@ 2022-07-05 17:26 ` William Zhang
-1 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Arnd Bergmann, Dmitry Osipenko, Eugen Hristev,
Joel Stanley, Mark Brown, Michael Walle, Russell King,
Stephan Gerhold, Thierry Reding, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 803 bytes --]
Remove CONFIG_ARCH_BCM_63XX and add BCMBCA sub platform configs.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/configs/multi_v7_defconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 948d18e59cf5..6780da0c9781 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -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
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 9/9] ARM: multi_v7_defconfig: Update configs for BCM63138
@ 2022-07-05 17:26 ` William Zhang
0 siblings, 0 replies; 33+ messages in thread
From: William Zhang @ 2022-07-05 17:26 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, kursad.oney, f.fainelli, anand.gore,
Broadcom Kernel List, philippe.reynes, dan.beygelman,
William Zhang, Arnd Bergmann, Dmitry Osipenko, Eugen Hristev,
Joel Stanley, Mark Brown, Michael Walle, Russell King,
Stephan Gerhold, Thierry Reding, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 803 bytes --]
Remove CONFIG_ARCH_BCM_63XX and add BCMBCA sub platform configs.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
arch/arm/configs/multi_v7_defconfig | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 948d18e59cf5..6780da0c9781 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -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
--
2.34.1
[-- Attachment #1.2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 33+ messages in thread