[PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Rafał Miłecki]

From: Rafał Miłecki <rafal@milecki.pl>

Always use a minus/hyphen char to separate model from version. This
unifies binding's "compatible" strings.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
index 454b0e93245d..cc34025fdc78 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
@@ -28,10 +28,10 @@ properties:
               - buffalo,wzr-1750dhp
               - linksys,ea6300-v1
               - linksys,ea6500-v2
-              - luxul,xap-1510v1
+              - luxul,xap-1510-v1
               - luxul,xwc-1000
-              - netgear,r6250v1
-              - netgear,r6300v2
+              - netgear,r6250-v1
+              - netgear,r6300-v2
               - smartrg,sr400ac
               - brcm,bcm94708
           - const: brcm,bcm4708
@@ -42,8 +42,8 @@ properties:
               - asus,rt-n18u
               - buffalo,wzr-600dhp2
               - buffalo,wzr-900dhp
-              - luxul,xap-1410v1
-              - luxul,xwr-1200v1
+              - luxul,xap-1410-v1
+              - luxul,xwr-1200-v1
               - tplink,archer-c5-v2
           - const: brcm,bcm47081
           - const: brcm,bcm4708
@@ -72,7 +72,7 @@ properties:
               - luxul,xap-1610-v1
               - luxul,xbr-4500-v1
               - luxul,xwc-2000-v1
-              - luxul,xwr-3100v1
+              - luxul,xwr-3100-v1
               - luxul,xwr-3150-v1
               - netgear,r8500
               - phicomm,k3
-- 
2.35.3

[PATCH 2/2] ARM: dts: BCM5301X: Use updated device "compatible" strings

[Rafał Miłecki]

From: Rafał Miłecki <rafal@milecki.pl>

Northstar binding was updated to use minus/hyphen char between model and
version for all devices.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts   | 2 +-
 arch/arm/boot/dts/bcm4708-netgear-r6250.dts    | 2 +-
 arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 2 +-
 arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts  | 2 +-
 arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts  | 2 +-
 arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
index 9b98a0179f05..5d0549855978 100644
--- a/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
+++ b/arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts
@@ -8,7 +8,7 @@
 #include "bcm4708.dtsi"
 
 / {
-	compatible = "luxul,xap-1510v1", "brcm,bcm4708";
+	compatible = "luxul,xap-1510-v1", "brcm,bcm4708";
 	model = "Luxul XAP-1510 V1";
 
 	chosen {
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
index 89155caf50be..8661ec94ca67 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6250.dts
@@ -13,7 +13,7 @@
 #include "bcm5301x-nand-cs0-bch8.dtsi"
 
 / {
-	compatible = "netgear,r6250v1", "brcm,bcm4708";
+	compatible = "netgear,r6250-v1", "brcm,bcm4708";
 	model = "Netgear R6250 V1 (BCM4708)";
 
 	chosen {
diff --git a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
index 57d00a0b4765..77396730bdd3 100644
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
@@ -12,7 +12,7 @@
 #include "bcm5301x-nand-cs0-bch8.dtsi"
 
 / {
-	compatible = "netgear,r6300v2", "brcm,bcm4708";
+	compatible = "netgear,r6300-v2", "brcm,bcm4708";
 	model = "Netgear R6300 V2 (BCM4708)";
 
 	chosen {
diff --git a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
index edc194085995..7e042928fd40 100644
--- a/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
+++ b/arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts
@@ -8,7 +8,7 @@
 #include "bcm47081.dtsi"
 
 / {
-	compatible = "luxul,xap-1410v1", "brcm,bcm47081", "brcm,bcm4708";
+	compatible = "luxul,xap-1410-v1", "brcm,bcm47081", "brcm,bcm4708";
 	model = "Luxul XAP-1410 V1";
 
 	chosen {
diff --git a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
index 97b61d9d4be9..231d437408d8 100644
--- a/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
+++ b/arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts
@@ -9,7 +9,7 @@
 #include "bcm5301x-nand-cs0-bch4.dtsi"
 
 / {
-	compatible = "luxul,xwr-1200v1", "brcm,bcm47081", "brcm,bcm4708";
+	compatible = "luxul,xwr-1200-v1", "brcm,bcm47081", "brcm,bcm4708";
 	model = "Luxul XWR-1200 V1";
 
 	chosen {
diff --git a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
index ebea188bd2d7..52783a4b6f99 100644
--- a/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
+++ b/arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts
@@ -9,7 +9,7 @@
 #include "bcm5301x-nand-cs0-bch4.dtsi"
 
 / {
-	compatible = "luxul,xwr-3100v1", "brcm,bcm47094", "brcm,bcm4708";
+	compatible = "luxul,xwr-3100-v1", "brcm,bcm47094", "brcm,bcm4708";
 	model = "Luxul XWR-3100 V1";
 
 	chosen {
-- 
2.35.3

Re: [PATCH 2/2] ARM: dts: BCM5301X: Use updated device "compatible" strings

[Linus Walleij]

On Sat, May 20, 2023 at 1:26 PM Rafał Miłecki <zajec5@gmail.com> wrote:

> From: Rafał Miłecki <rafal@milecki.pl>
>
> Northstar binding was updated to use minus/hyphen char between model and
> version for all devices.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 2/2] ARM: dts: BCM5301X: Use updated device "compatible" strings

[Florian Fainelli]

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

From: Florian Fainelli <f.fainelli@gmail.com>

On Sat, 20 May 2023 13:26:01 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Northstar binding was updated to use minus/hyphen char between model and
> version for all devices.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---

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

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

Re: [PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Linus Walleij]

On Sat, May 20, 2023 at 1:26 PM Rafał Miłecki <zajec5@gmail.com> wrote:

> From: Rafał Miłecki <rafal@milecki.pl>
>
> Always use a minus/hyphen char to separate model from version. This
> unifies binding's "compatible" strings.
>
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

Makes sense,
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij

Re: [PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Conor Dooley]

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

On Sat, May 20, 2023 at 01:26:00PM +0200, Rafał Miłecki wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Always use a minus/hyphen char to separate model from version. This
> unifies binding's "compatible" strings.

Am I just being paranoid in thinking that software may have relied on
the former naming scheme?
On the other hand, my OCD really likes the change.

> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---
>  .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml    | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
> index 454b0e93245d..cc34025fdc78 100644
> --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
> +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
> @@ -28,10 +28,10 @@ properties:
>                - buffalo,wzr-1750dhp
>                - linksys,ea6300-v1
>                - linksys,ea6500-v2
> -              - luxul,xap-1510v1
> +              - luxul,xap-1510-v1
>                - luxul,xwc-1000
> -              - netgear,r6250v1
> -              - netgear,r6300v2
> +              - netgear,r6250-v1
> +              - netgear,r6300-v2
>                - smartrg,sr400ac
>                - brcm,bcm94708
>            - const: brcm,bcm4708
> @@ -42,8 +42,8 @@ properties:
>                - asus,rt-n18u
>                - buffalo,wzr-600dhp2
>                - buffalo,wzr-900dhp
> -              - luxul,xap-1410v1
> -              - luxul,xwr-1200v1
> +              - luxul,xap-1410-v1
> +              - luxul,xwr-1200-v1
>                - tplink,archer-c5-v2
>            - const: brcm,bcm47081
>            - const: brcm,bcm4708
> @@ -72,7 +72,7 @@ properties:
>                - luxul,xap-1610-v1
>                - luxul,xbr-4500-v1
>                - luxul,xwc-2000-v1
> -              - luxul,xwr-3100v1
> +              - luxul,xwr-3100-v1
>                - luxul,xwr-3150-v1
>                - netgear,r8500
>                - phicomm,k3
> -- 
> 2.35.3
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Rafał Miłecki]

On 22.05.2023 19:08, Conor Dooley wrote:
> On Sat, May 20, 2023 at 01:26:00PM +0200, Rafał Miłecki wrote:
>> From: Rafał Miłecki <rafal@milecki.pl>
>>
>> Always use a minus/hyphen char to separate model from version. This
>> unifies binding's "compatible" strings.
> 
> Am I just being paranoid in thinking that software may have relied on
> the former naming scheme?
> On the other hand, my OCD really likes the change.

That's a very reasonable concern.


TLDR: The risk of any breakage is extremely low due to Northstar CFE
bootloader & projects with Northstar support.


There are very few Northstar devices with bootloader other than CFE.
All devices affected by this PATCH use CFE actually.
CFE on Northstar has no support for DTS (DTB).
DTB files are always appended to kernel on all affected devices.

So problem of some DTB stored in bootloader getting out of sync with
kernel / user-space is non-existent in this case.

We still should consider a risk of some out-of-tree driver or just
user-space checking for those compatible strings. I'm not aware of any
project other than OpenWrt providing system images for those devices.
There is some basic support in buildroot but it's quite dead. Even in
OpenWrt case the only possibly affected device is Netgear R6300 V2.
OpenWrt doesn't provide images for any of affected Luxul devices.

So there isn't any known project this change can actually break. If
there is one (very unlikely) it can still update its user-space or
out of kernel driver while updating DTB.

So while this change may be not the best approach (in general terms)
in this case it's very unlikely to break anything.


>> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
>> ---
>>   .../devicetree/bindings/arm/bcm/brcm,bcm4708.yaml    | 12 ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
>> index 454b0e93245d..cc34025fdc78 100644
>> --- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
>> +++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
>> @@ -28,10 +28,10 @@ properties:
>>                 - buffalo,wzr-1750dhp
>>                 - linksys,ea6300-v1
>>                 - linksys,ea6500-v2
>> -              - luxul,xap-1510v1
>> +              - luxul,xap-1510-v1
>>                 - luxul,xwc-1000
>> -              - netgear,r6250v1
>> -              - netgear,r6300v2
>> +              - netgear,r6250-v1
>> +              - netgear,r6300-v2
>>                 - smartrg,sr400ac
>>                 - brcm,bcm94708
>>             - const: brcm,bcm4708
>> @@ -42,8 +42,8 @@ properties:
>>                 - asus,rt-n18u
>>                 - buffalo,wzr-600dhp2
>>                 - buffalo,wzr-900dhp
>> -              - luxul,xap-1410v1
>> -              - luxul,xwr-1200v1
>> +              - luxul,xap-1410-v1
>> +              - luxul,xwr-1200-v1
>>                 - tplink,archer-c5-v2
>>             - const: brcm,bcm47081
>>             - const: brcm,bcm4708
>> @@ -72,7 +72,7 @@ properties:
>>                 - luxul,xap-1610-v1
>>                 - luxul,xbr-4500-v1
>>                 - luxul,xwc-2000-v1
>> -              - luxul,xwr-3100v1
>> +              - luxul,xwr-3100-v1
>>                 - luxul,xwr-3150-v1
>>                 - netgear,r8500
>>                 - phicomm,k3
>> -- 
>> 2.35.3
>>

Re: [PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Conor Dooley]

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

On Mon, May 22, 2023 at 10:29:38PM +0200, Rafał Miłecki wrote:
> On 22.05.2023 19:08, Conor Dooley wrote:
> > On Sat, May 20, 2023 at 01:26:00PM +0200, Rafał Miłecki wrote:
> > > From: Rafał Miłecki <rafal@milecki.pl>
> > > 
> > > Always use a minus/hyphen char to separate model from version. This
> > > unifies binding's "compatible" strings.
> > 
> > Am I just being paranoid in thinking that software may have relied on
> > the former naming scheme?
> > On the other hand, my OCD really likes the change.
> 
> That's a very reasonable concern.
> 
> 
> TLDR: The risk of any breakage is extremely low due to Northstar CFE
> bootloader & projects with Northstar support.
> 
> 
> There are very few Northstar devices with bootloader other than CFE.
> All devices affected by this PATCH use CFE actually.
> CFE on Northstar has no support for DTS (DTB).
> DTB files are always appended to kernel on all affected devices.
> 
> So problem of some DTB stored in bootloader getting out of sync with
> kernel / user-space is non-existent in this case.
> 
> We still should consider a risk of some out-of-tree driver or just
> user-space checking for those compatible strings. I'm not aware of any
> project other than OpenWrt providing system images for those devices.
> There is some basic support in buildroot but it's quite dead. Even in
> OpenWrt case the only possibly affected device is Netgear R6300 V2.
> OpenWrt doesn't provide images for any of affected Luxul devices.
> 
> So there isn't any known project this change can actually break. If
> there is one (very unlikely) it can still update its user-space or
> out of kernel driver while updating DTB.
> 
> So while this change may be not the best approach (in general terms)
> in this case it's very unlikely to break anything.

Okay. I think this sounds reasonable to do then. Thanks for the
explanation :)
Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Krzysztof Kozlowski]

On 22/05/2023 22:29, Rafał Miłecki wrote:
> On 22.05.2023 19:08, Conor Dooley wrote:
>> On Sat, May 20, 2023 at 01:26:00PM +0200, Rafał Miłecki wrote:
>>> From: Rafał Miłecki <rafal@milecki.pl>
>>>
>>> Always use a minus/hyphen char to separate model from version. This
>>> unifies binding's "compatible" strings.
>>
>> Am I just being paranoid in thinking that software may have relied on
>> the former naming scheme?
>> On the other hand, my OCD really likes the change.
> 
> That's a very reasonable concern.
> 
> 
> TLDR: The risk of any breakage is extremely low due to Northstar CFE
> bootloader & projects with Northstar support.
> 
> 
> There are very few Northstar devices with bootloader other than CFE.
> All devices affected by this PATCH use CFE actually.
> CFE on Northstar has no support for DTS (DTB).
> DTB files are always appended to kernel on all affected devices.
> 
> So problem of some DTB stored in bootloader getting out of sync with
> kernel / user-space is non-existent in this case.
> 
> We still should consider a risk of some out-of-tree driver or just
> user-space checking for those compatible strings. I'm not aware of any
> project other than OpenWrt providing system images for those devices.
> There is some basic support in buildroot but it's quite dead. Even in
> OpenWrt case the only possibly affected device is Netgear R6300 V2.
> OpenWrt doesn't provide images for any of affected Luxul devices.
> 
> So there isn't any known project this change can actually break. If
> there is one (very unlikely) it can still update its user-space or
> out of kernel driver while updating DTB.
> 
> So while this change may be not the best approach (in general terms)
> in this case it's very unlikely to break anything.

You should explain this - reason for ABI break - in commit msg.

Or just keep old compatibles as deprecated.

Best regards,
Krzysztof

Re: [PATCH 1/2] dt-bindings: arm: bcm: unify version notation of Northstar devices

[Florian Fainelli]

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

From: Florian Fainelli <f.fainelli@gmail.com>

On Sat, 20 May 2023 13:26:00 +0200, Rafał Miłecki <zajec5@gmail.com> wrote:
> From: Rafał Miłecki <rafal@milecki.pl>
> 
> Always use a minus/hyphen char to separate model from version. This
> unifies binding's "compatible" strings.
> 
> Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
> ---

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

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