| Message ID | 20220401172427.2806-1-arinc.unal@arinc9.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] dt-bindings: arm: bcm: fix BCM53012 and BCM53016 SoC strings | expand |
On 01/04/2022 19:24, Arınç ÜNAL wrote: > Fix inaccurate SoC strings brcm,brcm53012 and brcm,brcm53016 to respectively > brcm,bcm53012 and brcm,bcm53016. > > Create a new description for BCM53016 and move Meraki MR32 under it. > > Fixes: 4cb5201fcb5d ("dt-bindings: arm: bcm: Convert BCM4708 to YAML") > Fixes: a2e385f5374d ("dt-bindings: ARM: add bindings for the Meraki MR32") > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> > --- > brcm,bcm53012 string was silently changed to brcm,brcm53012 after > converting to YAML. Let me know if this was intentional. > Thanks for your patch. This looks like 2 or 3 separate patches: 1. Correct meraki and BCM53016 bindings, 2. Rename brcm->bcm, in bindings, 3. Change DTS. Best regards, Krzysztof
On 02/04/2022 19:28, Krzysztof Kozlowski wrote: > On 01/04/2022 19:24, Arınç ÜNAL wrote: >> Fix inaccurate SoC strings brcm,brcm53012 and brcm,brcm53016 to respectively >> brcm,bcm53012 and brcm,bcm53016. >> >> Create a new description for BCM53016 and move Meraki MR32 under it. >> >> Fixes: 4cb5201fcb5d ("dt-bindings: arm: bcm: Convert BCM4708 to YAML") >> Fixes: a2e385f5374d ("dt-bindings: ARM: add bindings for the Meraki MR32") >> Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> >> --- >> brcm,bcm53012 string was silently changed to brcm,brcm53012 after >> converting to YAML. Let me know if this was intentional. >> > > Thanks for your patch. This looks like 2 or 3 separate patches: > 1. Correct meraki and BCM53016 bindings, > 2. Rename brcm->bcm, in bindings, > 3. Change DTS. Will send v2, thanks. Arınç
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml index 434d3c6db61e..8a97ee048053 100644 --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml @@ -83,9 +83,14 @@ properties: - brcm,bcm953012er - brcm,bcm953012hr - brcm,bcm953012k + - const: brcm,bcm53012 + - const: brcm,bcm4708 + + - description: BCM53016 based boards + items: + - enum: - meraki,mr32 - - const: brcm,brcm53012 - - const: brcm,brcm53016 + - const: brcm,bcm53016 - const: brcm,bcm4708 additionalProperties: true diff --git a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts index 66c64a6ec414..daca63f25134 100644 --- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts +++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts @@ -13,7 +13,7 @@ #include <dt-bindings/leds/common.h> / { - compatible = "meraki,mr32", "brcm,brcm53016", "brcm,bcm4708"; + compatible = "meraki,mr32", "brcm,bcm53016", "brcm,bcm4708"; model = "Meraki MR32"; chosen { diff --git a/arch/arm/boot/dts/bcm953012er.dts b/arch/arm/boot/dts/bcm953012er.dts index 52feca0fb906..dd63a148a16b 100644 --- a/arch/arm/boot/dts/bcm953012er.dts +++ b/arch/arm/boot/dts/bcm953012er.dts @@ -37,7 +37,7 @@ / { model = "NorthStar Enterprise Router (BCM953012ER)"; - compatible = "brcm,bcm953012er", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012er", "brcm,bcm53012", "brcm,bcm4708"; memory@0 { device_type = "memory"; diff --git a/arch/arm/boot/dts/bcm953012hr.dts b/arch/arm/boot/dts/bcm953012hr.dts index 9140be7ec053..b070b69466bd 100644 --- a/arch/arm/boot/dts/bcm953012hr.dts +++ b/arch/arm/boot/dts/bcm953012hr.dts @@ -37,7 +37,7 @@ / { model = "NorthStar HR (BCM953012HR)"; - compatible = "brcm,bcm953012hr", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012hr", "brcm,bcm53012", "brcm,bcm4708"; aliases { ethernet0 = &gmac0; diff --git a/arch/arm/boot/dts/bcm953012k.dts b/arch/arm/boot/dts/bcm953012k.dts index de40bd59a5fa..f1e6bcaa1edd 100644 --- a/arch/arm/boot/dts/bcm953012k.dts +++ b/arch/arm/boot/dts/bcm953012k.dts @@ -36,7 +36,7 @@ / { model = "NorthStar SVK (BCM953012K)"; - compatible = "brcm,bcm953012k", "brcm,brcm53012", "brcm,bcm4708"; + compatible = "brcm,bcm953012k", "brcm,bcm53012", "brcm,bcm4708"; aliases { serial0 = &uart0;
Fix inaccurate SoC strings brcm,brcm53012 and brcm,brcm53016 to respectively brcm,bcm53012 and brcm,bcm53016. Create a new description for BCM53016 and move Meraki MR32 under it. Fixes: 4cb5201fcb5d ("dt-bindings: arm: bcm: Convert BCM4708 to YAML") Fixes: a2e385f5374d ("dt-bindings: ARM: add bindings for the Meraki MR32") Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- brcm,bcm53012 string was silently changed to brcm,brcm53012 after converting to YAML. Let me know if this was intentional. Arınç --- .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml | 9 +++++++-- arch/arm/boot/dts/bcm53016-meraki-mr32.dts | 2 +- arch/arm/boot/dts/bcm953012er.dts | 2 +- arch/arm/boot/dts/bcm953012hr.dts | 2 +- arch/arm/boot/dts/bcm953012k.dts | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-)