* [PATCH v2 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
2022-07-25 5:53 [PATCH v2 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
@ 2022-07-25 5:53 ` William Zhang
2022-07-25 23:30 ` Rob Herring
2022-07-25 5:53 ` [PATCH v2 2/9] dt-bindings: arm64: bcmbca: Update BCM4908 description William Zhang
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: William Zhang @ 2022-07-25 5:53 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, f.fainelli, Broadcom Kernel List, dan.beygelman,
anand.gore, kursad.oney, rafal, krzysztof.kozlowski,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3341 bytes --]
BCM4908 is one of the Broadcom Broadband origin WLAN Router/Access
Pointer SoCs. It was originally added by Rafał before Broadcom
started to upstream the support for broadband SoCs. Now that Broadcom
Broadband SoC is supported under arch ARCH_BCMBCA, this patch moves
BCM4908 SoC device tree descriptions into BCMBCA binding.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Rafał Miłecki <rafal@milecki.pl>
---
Changes in v2:
- Add Acked-by tag
- Improve commit message with more details
.../bindings/arm/bcm/brcm,bcm4908.yaml | 42 -------------------
.../bindings/arm/bcm/brcm,bcmbca.yaml | 21 ++++++++++
2 files changed, 21 insertions(+), 42 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
deleted file mode 100644
index 9b745531ff04..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
-%YAML 1.2
----
-$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4908.yaml#
-$schema: http://devicetree.org/meta-schemas/core.yaml#
-
-title: Broadcom BCM4908 device tree bindings
-
-description:
- Broadcom BCM4906 / BCM4908 / BCM49408 Wi-Fi/network SoCs with Brahma CPUs.
-
-maintainers:
- - Rafał Miłecki <rafal@milecki.pl>
-
-properties:
- $nodename:
- const: '/'
- compatible:
- oneOf:
- - description: BCM4906 based boards
- items:
- - enum:
- - netgear,r8000p
- - tplink,archer-c2300-v1
- - const: brcm,bcm4906
- - const: brcm,bcm4908
-
- - description: BCM4908 based boards
- items:
- - enum:
- - asus,gt-ac5300
- - netgear,raxe500
- - const: brcm,bcm4908
-
- - description: BCM49408 based boards
- items:
- - const: brcm,bcm49408
- - const: brcm,bcm4908
-
-additionalProperties: true
-
-...
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
index 324e59104360..6a64afa95918 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
@@ -15,6 +15,7 @@ maintainers:
- William Zhang <william.zhang@broadcom.com>
- Anand Gore <anand.gore@broadcom.com>
- Kursad Oney <kursad.oney@broadcom.com>
+ - Rafał Miłecki <rafal@milecki.pl>
properties:
$nodename:
@@ -28,6 +29,26 @@ properties:
- const: brcm,bcm47622
- const: brcm,bcmbca
+ - description: BCM4906 based boards
+ items:
+ - enum:
+ - netgear,r8000p
+ - tplink,archer-c2300-v1
+ - const: brcm,bcm4906
+ - const: brcm,bcm4908
+
+ - description: BCM4908 based boards
+ items:
+ - enum:
+ - asus,gt-ac5300
+ - netgear,raxe500
+ - const: brcm,bcm4908
+
+ - description: BCM49408 based boards
+ items:
+ - const: brcm,bcm49408
+ - const: brcm,bcm4908
+
- description: BCM4912 based boards
items:
- enum:
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA
2022-07-25 5:53 ` [PATCH v2 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA William Zhang
@ 2022-07-25 23:30 ` Rob Herring
0 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2022-07-25 23:30 UTC (permalink / raw)
To: William Zhang
Cc: Broadcom Kernel List, Linux ARM List, linux-kernel, dan.beygelman,
Rob Herring, joel.peshkin, f.fainelli, Krzysztof Kozlowski,
anand.gore, krzysztof.kozlowski, rafal, kursad.oney, devicetree
On Sun, 24 Jul 2022 22:53:54 -0700, William Zhang wrote:
> BCM4908 is one of the Broadcom Broadband origin WLAN Router/Access
> Pointer SoCs. It was originally added by Rafał before Broadcom
> started to upstream the support for broadband SoCs. Now that Broadcom
> Broadband SoC is supported under arch ARCH_BCMBCA, this patch moves
> BCM4908 SoC device tree descriptions into BCMBCA binding.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Acked-by: Rafał Miłecki <rafal@milecki.pl>
>
> ---
>
> Changes in v2:
> - Add Acked-by tag
> - Improve commit message with more details
>
> .../bindings/arm/bcm/brcm,bcm4908.yaml | 42 -------------------
> .../bindings/arm/bcm/brcm,bcmbca.yaml | 21 ++++++++++
> 2 files changed, 21 insertions(+), 42 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4908.yaml
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 2/9] dt-bindings: arm64: bcmbca: Update BCM4908 description
2022-07-25 5:53 [PATCH v2 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
2022-07-25 5:53 ` [PATCH v2 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA William Zhang
@ 2022-07-25 5:53 ` William Zhang
2022-07-25 23:33 ` Rob Herring
2022-07-25 5:53 ` [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files William Zhang
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: William Zhang @ 2022-07-25 5:53 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, f.fainelli, Broadcom Kernel List, dan.beygelman,
anand.gore, kursad.oney, rafal, krzysztof.kozlowski,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
Append "brcm,bcmbca" to BCM4908 chip family compatible strings to
follow the convention of BCMBCA chip and help identifying chip family.
Also add a bare bone generic 4908 board compatbile string to support any
4908 based board. This is useful for board bring-up test and kernel test
with CPU and memory related change.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Rafał Miłecki <rafal@milecki.pl>
---
Changes in v2:
- Add Acked-by tag
- Insert the 4908 generic compatible string in alphabetical order
- Update commit message with more details of 4908 generic board dts
Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
index 6a64afa95918..84866e29cab0 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
@@ -36,18 +36,22 @@ properties:
- tplink,archer-c2300-v1
- const: brcm,bcm4906
- const: brcm,bcm4908
+ - const: brcm,bcmbca
- description: BCM4908 based boards
items:
- enum:
- asus,gt-ac5300
+ - brcm,bcm94908
- netgear,raxe500
- const: brcm,bcm4908
+ - const: brcm,bcmbca
- description: BCM49408 based boards
items:
- const: brcm,bcm49408
- const: brcm,bcm4908
+ - const: brcm,bcmbca
- description: BCM4912 based boards
items:
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 2/9] dt-bindings: arm64: bcmbca: Update BCM4908 description
2022-07-25 5:53 ` [PATCH v2 2/9] dt-bindings: arm64: bcmbca: Update BCM4908 description William Zhang
@ 2022-07-25 23:33 ` Rob Herring
0 siblings, 0 replies; 12+ messages in thread
From: Rob Herring @ 2022-07-25 23:33 UTC (permalink / raw)
To: William Zhang
Cc: Rob Herring, rafal, Broadcom Kernel List, linux-kernel,
anand.gore, Linux ARM List, f.fainelli, kursad.oney,
krzysztof.kozlowski, joel.peshkin, Krzysztof Kozlowski,
dan.beygelman, devicetree
On Sun, 24 Jul 2022 22:53:55 -0700, William Zhang wrote:
> Append "brcm,bcmbca" to BCM4908 chip family compatible strings to
> follow the convention of BCMBCA chip and help identifying chip family.
>
> Also add a bare bone generic 4908 board compatbile string to support any
> 4908 based board. This is useful for board bring-up test and kernel test
> with CPU and memory related change.
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Acked-by: Rafał Miłecki <rafal@milecki.pl>
>
> ---
>
> Changes in v2:
> - Add Acked-by tag
> - Insert the 4908 generic compatible string in alphabetical order
> - Update commit message with more details of 4908 generic board dts
>
> Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml | 4 ++++
> 1 file changed, 4 insertions(+)
>
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files
2022-07-25 5:53 [PATCH v2 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
2022-07-25 5:53 ` [PATCH v2 1/9] dt-bindings: arm64: bcmbca: Merge BCM4908 into BCMBCA William Zhang
2022-07-25 5:53 ` [PATCH v2 2/9] dt-bindings: arm64: bcmbca: Update BCM4908 description William Zhang
@ 2022-07-25 5:53 ` William Zhang
2022-07-25 23:32 ` Rob Herring
2022-07-25 5:53 ` [PATCH v2 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder William Zhang
2022-07-25 5:53 ` [PATCH v2 5/9] arm64: dts: Add BCM4908 generic board dts William Zhang
4 siblings, 1 reply; 12+ messages in thread
From: William Zhang @ 2022-07-25 5:53 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, f.fainelli, Broadcom Kernel List, dan.beygelman,
anand.gore, kursad.oney, rafal, krzysztof.kozlowski,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2973 bytes --]
Append "brcm,bcmbca" to compatible strings based on the new bcmbca
binding rule for BCM4908 family based boards. This will break drivers
that use the old compatible string for binding. Fortunately there is no
such usage in linux and u-boot.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
Acked-by: Rafał Miłecki <rafal@milecki.pl>
---
Changes in v2:
- Add Acked-by tag
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 2 +-
.../dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 2 +-
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 2 +-
.../arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
index 2dd028438c22..d8b60575eb4f 100644
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
@@ -7,7 +7,7 @@
#include "bcm4906.dtsi"
/ {
- compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908";
+ compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
model = "Netgear R8000P";
memory@0 {
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
index 064f7f549665..296393d4aaab 100644
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
@@ -7,7 +7,7 @@
#include "bcm4906.dtsi"
/ {
- compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908";
+ compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
model = "TP-Link Archer C2300 V1";
memory@0 {
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
index 04f8524b5335..787c7ddf9102 100644
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
@@ -6,7 +6,7 @@
#include "bcm4908.dtsi"
/ {
- compatible = "asus,gt-ac5300", "brcm,bcm4908";
+ compatible = "asus,gt-ac5300", "brcm,bcm4908", "brcm,bcmbca";
model = "Asus GT-AC5300";
memory@0 {
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
index 3c2cf2d238b6..23b96c663239 100644
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
@@ -3,7 +3,7 @@
#include "bcm4908.dtsi"
/ {
- compatible = "netgear,raxe500", "brcm,bcm4908";
+ compatible = "netgear,raxe500", "brcm,bcm4908", "brcm,bcmbca";
model = "Netgear RAXE500";
memory@0 {
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files
2022-07-25 5:53 ` [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files William Zhang
@ 2022-07-25 23:32 ` Rob Herring
2022-07-26 1:09 ` William Zhang
0 siblings, 1 reply; 12+ messages in thread
From: Rob Herring @ 2022-07-25 23:32 UTC (permalink / raw)
To: William Zhang
Cc: Linux ARM List, joel.peshkin, f.fainelli, Broadcom Kernel List,
dan.beygelman, anand.gore, kursad.oney, rafal,
krzysztof.kozlowski, Krzysztof Kozlowski, devicetree,
linux-kernel
On Sun, Jul 24, 2022 at 10:53:56PM -0700, William Zhang wrote:
> Append "brcm,bcmbca" to compatible strings based on the new bcmbca
> binding rule for BCM4908 family based boards. This will break drivers
> that use the old compatible string for binding. Fortunately there is no
> such usage in linux and u-boot.
How does adding an additional compatible break things?
>
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> Acked-by: Rafał Miłecki <rafal@milecki.pl>
>
> ---
>
> Changes in v2:
> - Add Acked-by tag
>
> arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 2 +-
> .../dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 2 +-
> arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 2 +-
> .../arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
> index 2dd028438c22..d8b60575eb4f 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
> @@ -7,7 +7,7 @@
> #include "bcm4906.dtsi"
>
> / {
> - compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908";
> + compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
> model = "Netgear R8000P";
>
> memory@0 {
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
> index 064f7f549665..296393d4aaab 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
> @@ -7,7 +7,7 @@
> #include "bcm4906.dtsi"
>
> / {
> - compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908";
> + compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
> model = "TP-Link Archer C2300 V1";
>
> memory@0 {
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
> index 04f8524b5335..787c7ddf9102 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
> @@ -6,7 +6,7 @@
> #include "bcm4908.dtsi"
>
> / {
> - compatible = "asus,gt-ac5300", "brcm,bcm4908";
> + compatible = "asus,gt-ac5300", "brcm,bcm4908", "brcm,bcmbca";
> model = "Asus GT-AC5300";
>
> memory@0 {
> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
> index 3c2cf2d238b6..23b96c663239 100644
> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
> @@ -3,7 +3,7 @@
> #include "bcm4908.dtsi"
>
> / {
> - compatible = "netgear,raxe500", "brcm,bcm4908";
> + compatible = "netgear,raxe500", "brcm,bcm4908", "brcm,bcmbca";
> model = "Netgear RAXE500";
>
> memory@0 {
> --
> 2.34.1
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files
2022-07-25 23:32 ` Rob Herring
@ 2022-07-26 1:09 ` William Zhang
2022-07-27 10:39 ` Rafał Miłecki
0 siblings, 1 reply; 12+ messages in thread
From: William Zhang @ 2022-07-26 1:09 UTC (permalink / raw)
To: Rob Herring
Cc: Linux ARM List, joel.peshkin, f.fainelli, Broadcom Kernel List,
dan.beygelman, anand.gore, kursad.oney, rafal,
krzysztof.kozlowski, Krzysztof Kozlowski, devicetree,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3755 bytes --]
Hi Rob,
On 07/25/2022 04:32 PM, Rob Herring wrote:
> On Sun, Jul 24, 2022 at 10:53:56PM -0700, William Zhang wrote:
>> Append "brcm,bcmbca" to compatible strings based on the new bcmbca
>> binding rule for BCM4908 family based boards. This will break drivers
>> that use the old compatible string for binding. Fortunately there is no
>> such usage in linux and u-boot.
>
> How does adding an additional compatible break things?
> In theory when some crazy code tries to match the entire string. But not
in linux, u-boot code and hopefully not in other bootloader and Os does
that. But this does change an existing compatible string so Krzysztof
suggested to add comment about the breakage in the commit message. I can
remove this and send v3 if you guys think it is necessary.
>>
>> Signed-off-by: William Zhang <william.zhang@broadcom.com>
>> Acked-by: Rafał Miłecki <rafal@milecki.pl>
>>
>> ---
>>
>> Changes in v2:
>> - Add Acked-by tag
>>
>> arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts | 2 +-
>> .../dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 2 +-
>> arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 2 +-
>> .../arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts | 2 +-
>> 4 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
>> index 2dd028438c22..d8b60575eb4f 100644
>> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
>> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
>> @@ -7,7 +7,7 @@
>> #include "bcm4906.dtsi"
>>
>> / {
>> - compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908";
>> + compatible = "netgear,r8000p", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
>> model = "Netgear R8000P";
>>
>> memory@0 {
>> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
>> index 064f7f549665..296393d4aaab 100644
>> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
>> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
>> @@ -7,7 +7,7 @@
>> #include "bcm4906.dtsi"
>>
>> / {
>> - compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908";
>> + compatible = "tplink,archer-c2300-v1", "brcm,bcm4906", "brcm,bcm4908", "brcm,bcmbca";
>> model = "TP-Link Archer C2300 V1";
>>
>> memory@0 {
>> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
>> index 04f8524b5335..787c7ddf9102 100644
>> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
>> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
>> @@ -6,7 +6,7 @@
>> #include "bcm4908.dtsi"
>>
>> / {
>> - compatible = "asus,gt-ac5300", "brcm,bcm4908";
>> + compatible = "asus,gt-ac5300", "brcm,bcm4908", "brcm,bcmbca";
>> model = "Asus GT-AC5300";
>>
>> memory@0 {
>> diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
>> index 3c2cf2d238b6..23b96c663239 100644
>> --- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
>> +++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
>> @@ -3,7 +3,7 @@
>> #include "bcm4908.dtsi"
>>
>> / {
>> - compatible = "netgear,raxe500", "brcm,bcm4908";
>> + compatible = "netgear,raxe500", "brcm,bcm4908", "brcm,bcmbca";
>> model = "Netgear RAXE500";
>>
>> memory@0 {
>> --
>> 2.34.1
>>
>
>
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files
2022-07-26 1:09 ` William Zhang
@ 2022-07-27 10:39 ` Rafał Miłecki
2022-07-27 12:12 ` Krzysztof Kozlowski
0 siblings, 1 reply; 12+ messages in thread
From: Rafał Miłecki @ 2022-07-27 10:39 UTC (permalink / raw)
To: William Zhang
Cc: Rob Herring, Linux ARM List, joel.peshkin, f.fainelli,
Broadcom Kernel List, dan.beygelman, anand.gore, kursad.oney,
krzysztof.kozlowski, Krzysztof Kozlowski, devicetree,
linux-kernel
On 2022-07-26 03:09, William Zhang wrote:
> On 07/25/2022 04:32 PM, Rob Herring wrote:
>> On Sun, Jul 24, 2022 at 10:53:56PM -0700, William Zhang wrote:
>>> Append "brcm,bcmbca" to compatible strings based on the new bcmbca
>>> binding rule for BCM4908 family based boards. This will break drivers
>>> that use the old compatible string for binding. Fortunately there is
>>> no
>>> such usage in linux and u-boot.
>>
>> How does adding an additional compatible break things?
>> In theory when some crazy code tries to match the entire string. But
>> not
> in linux, u-boot code and hopefully not in other bootloader and Os
> does that. But this does change an existing compatible string so
> Krzysztof suggested to add comment about the breakage in the commit
> message. I can remove this and send v3 if you guys think it is
> necessary.
Krzysztof commented on ABI breakage [1] when you tried removing
"brcm,bcm4908" from the "compatible" list in your patch
[RFC PATCH 3/3] arm64: dts: bcmbca: update bcm4808 board dts file [2]
In this version of your patch you don't remove "brcm,bcm4908" anymore so
this change doesn't break anything. Adding a new "compatible" string
doesn't break things. You can remove that info from the commit message.
[1]
https://lore.kernel.org/linux-arm-kernel/d93e55fa-3359-2609-aad5-c80eca78f380@linaro.org/
[2]
https://lore.kernel.org/linux-arm-kernel/20220712021144.7068-4-william.zhang@broadcom.com/
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files
2022-07-27 10:39 ` Rafał Miłecki
@ 2022-07-27 12:12 ` Krzysztof Kozlowski
0 siblings, 0 replies; 12+ messages in thread
From: Krzysztof Kozlowski @ 2022-07-27 12:12 UTC (permalink / raw)
To: Rafał Miłecki, William Zhang
Cc: Rob Herring, Linux ARM List, joel.peshkin, f.fainelli,
Broadcom Kernel List, dan.beygelman, anand.gore, kursad.oney,
Krzysztof Kozlowski, devicetree, linux-kernel
On 27/07/2022 12:39, Rafał Miłecki wrote:
> On 2022-07-26 03:09, William Zhang wrote:
>> On 07/25/2022 04:32 PM, Rob Herring wrote:
>>> On Sun, Jul 24, 2022 at 10:53:56PM -0700, William Zhang wrote:
>>>> Append "brcm,bcmbca" to compatible strings based on the new bcmbca
>>>> binding rule for BCM4908 family based boards. This will break drivers
>>>> that use the old compatible string for binding. Fortunately there is
>>>> no
>>>> such usage in linux and u-boot.
>>>
>>> How does adding an additional compatible break things?
>>> In theory when some crazy code tries to match the entire string. But
>>> not
>> in linux, u-boot code and hopefully not in other bootloader and Os
>> does that. But this does change an existing compatible string so
>> Krzysztof suggested to add comment about the breakage in the commit
>> message. I can remove this and send v3 if you guys think it is
>> necessary.
>
> Krzysztof commented on ABI breakage [1] when you tried removing
> "brcm,bcm4908" from the "compatible" list in your patch
> [RFC PATCH 3/3] arm64: dts: bcmbca: update bcm4808 board dts file [2]
>
> In this version of your patch you don't remove "brcm,bcm4908" anymore so
> this change doesn't break anything. Adding a new "compatible" string
> doesn't break things. You can remove that info from the commit message.
Thanks... It is second thing (after not existing Reviewed-by) attributed
to me by William, although here probably by misunderstanding... So for
clarity (obvious stuff is not always obvious to everyone):
1. Removal of compatible is an ABI break.
2. Add of compatible is not an ABI break.
See also:
https://elixir.bootlin.com/linux/v5.19-rc8/source/Documentation/devicetree/bindings/ABI.rst#L26
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder
2022-07-25 5:53 [PATCH v2 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
` (2 preceding siblings ...)
2022-07-25 5:53 ` [PATCH v2 3/9] arm64: dts: bcmbca: update BCM4908 board dts files William Zhang
@ 2022-07-25 5:53 ` William Zhang
2022-07-25 5:53 ` [PATCH v2 5/9] arm64: dts: Add BCM4908 generic board dts William Zhang
4 siblings, 0 replies; 12+ messages in thread
From: William Zhang @ 2022-07-25 5:53 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, f.fainelli, Broadcom Kernel List, dan.beygelman,
anand.gore, kursad.oney, rafal, krzysztof.kozlowski,
William Zhang, Krzysztof Kozlowski, Nicolas Saenz Julienne,
Rob Herring, Stefan Wahren, devicetree, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 4879 bytes --]
As part of ARCH_BCM4908 to ARCH_BCMBCA migration, move the BCM4908 dts
files to bcmbca folder and use CONFIG_ARCH_BCMBCA to build all the
BCM4908 board dts. Delete bcm4908 folder and its makefile as well.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
(no changes since v1)
arch/arm64/boot/dts/broadcom/Makefile | 1 -
arch/arm64/boot/dts/broadcom/bcm4908/Makefile | 5 -----
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 4 ++++
.../broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts | 0
.../{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts | 0
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi | 0
.../broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts | 0
.../broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts | 0
.../arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi | 0
9 files changed, 4 insertions(+), 6 deletions(-)
delete mode 100644 arch/arm64/boot/dts/broadcom/bcm4908/Makefile
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-netgear-r8000p.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906-tplink-archer-c2300-v1.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4906.dtsi (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-asus-gt-ac5300.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908-netgear-raxe500.dts (100%)
rename arch/arm64/boot/dts/broadcom/{bcm4908 => bcmbca}/bcm4908.dtsi (100%)
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index e8584d3b698f..05d8c5ecf3b0 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -8,7 +8,6 @@ dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-400.dtb \
bcm2837-rpi-cm3-io3.dtb \
bcm2837-rpi-zero-2-w.dtb
-subdir-y += bcm4908
subdir-y += bcmbca
subdir-y += northstar2
subdir-y += stingray
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile b/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
deleted file mode 100644
index 6e364e304d4f..000000000000
--- a/arch/arm64/boot/dts/broadcom/bcm4908/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-netgear-r8000p.dtb
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4906-tplink-archer-c2300-v1.dtb
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-asus-gt-ac5300.dtb
-dtb-$(CONFIG_ARCH_BCM4908) += bcm4908-netgear-raxe500.dtb
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
index 38f14307184b..d30fa75f0611 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
@@ -1,5 +1,9 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_BCMBCA) += \
+ bcm4906-netgear-r8000p.dtb \
+ bcm4906-tplink-archer-c2300-v1.dtb \
+ bcm4908-asus-gt-ac5300.dtb \
+ bcm4908-netgear-raxe500.dtb \
bcm4912-asus-gt-ax6000.dtb \
bcm94912.dtb \
bcm963158.dtb \
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-netgear-r8000p.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906-tplink-archer-c2300-v1.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4906.dtsi
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-netgear-raxe500.dts
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908-netgear-raxe500.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi b/arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
rename to arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH v2 5/9] arm64: dts: Add BCM4908 generic board dts
2022-07-25 5:53 [PATCH v2 0/9] arm64: bcmbca: Move BCM4908 SoC support under ARCH_BCMBCA William Zhang
` (3 preceding siblings ...)
2022-07-25 5:53 ` [PATCH v2 4/9] arm64: dts: Move BCM4908 dts to bcmbca folder William Zhang
@ 2022-07-25 5:53 ` William Zhang
4 siblings, 0 replies; 12+ messages in thread
From: William Zhang @ 2022-07-25 5:53 UTC (permalink / raw)
To: Linux ARM List
Cc: joel.peshkin, f.fainelli, Broadcom Kernel List, dan.beygelman,
anand.gore, kursad.oney, rafal, krzysztof.kozlowski,
William Zhang, Krzysztof Kozlowski, Rob Herring, devicetree,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1806 bytes --]
Add generic bare bone bcm94908.dts file to support any 4908 based
design. It supports cpu subsystem, memory and an uart console. This can
be useful for board bring-up and cpu subsystem and memory related kernel
test as well.
Signed-off-by: William Zhang <william.zhang@broadcom.com>
---
Changes in v2:
- Update commit message with more details
arch/arm64/boot/dts/broadcom/bcmbca/Makefile | 1 +
.../boot/dts/broadcom/bcmbca/bcm94908.dts | 30 +++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
index d30fa75f0611..27741b71ba9e 100644
--- a/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/Makefile
@@ -4,6 +4,7 @@ dtb-$(CONFIG_ARCH_BCMBCA) += \
bcm4906-tplink-archer-c2300-v1.dtb \
bcm4908-asus-gt-ac5300.dtb \
bcm4908-netgear-raxe500.dtb \
+ bcm94908.dtb \
bcm4912-asus-gt-ax6000.dtb \
bcm94912.dtb \
bcm963158.dtb \
diff --git a/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
new file mode 100644
index 000000000000..fcbd3c430ace
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2022 Broadcom Ltd.
+ */
+
+/dts-v1/;
+
+#include "bcm4908.dtsi"
+
+/ {
+ model = "Broadcom BCM94908 Reference Board";
+ compatible = "brcm,bcm94908", "brcm,bcm4908", "brcm,bcmbca";
+
+ aliases {
+ serial0 = &uart0;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory@0 {
+ device_type = "memory";
+ reg = <0x0 0x0 0x0 0x08000000>;
+ };
+};
+
+&uart0 {
+ status = "okay";
+};
--
2.34.1
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4212 bytes --]
^ permalink raw reply related [flat|nested] 12+ messages in thread