[PATCH v2 0/2] Device tree updates for IXP4xx

[PATCH v2 0/2] Device tree updates for IXP4xx

[Linus Walleij]

This adds missing vendors and compatibles.

I can merge this through the ARM SoC tree unless
Rob wants to take it.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Changes in v2:
- Speling mistake: adiend -> adieng
- Link to v1: https://lore.kernel.org/r/20230925-ixp4xx-usr8200-v1-0-cd72a2e1ce91@linaro.org

---
Linus Walleij (2):
      dt-bindings: Add vendor prefixes
      dt-bindings: arm: List more IXP4xx devices

 .../devicetree/bindings/arm/intel-ixp4xx.yaml          | 18 ++++++++++++++++++
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 14 ++++++++++++++
 2 files changed, 32 insertions(+)
---
base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
change-id: 20230919-ixp4xx-usr8200-b2408d6fcad5

Best regards,
-- 
Linus Walleij <linus.walleij@linaro.org>

[PATCH v2 1/2] dt-bindings: Add vendor prefixes

[Linus Walleij]

These vendor prefixes are used by some routers supported
by e.g. OpenWrt.

- ADI Engineering is a US telecom equipment company.

- Arcom Controllers is a US manufacturer of repeaters.

- Freecom Gmbh is a german telecom equipment company.

- Gemtek Technology is a Taiwan telecom company.

- Gateway Communications was a telecommunication company,
  now acquired by HKT Limited/PCCW.

- Goramo Gorecki is a privately owned Polish telecom
  company.

- U.S. Robotics Corporation, known through their brand name
  USRobotics is generally referred to as "USR" so use this
  prefix for the company's device tree bindings.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 Documentation/devicetree/bindings/vendor-prefixes.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
index 573578db9509..edeb870c84cd 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@ -59,6 +59,8 @@ patternProperties:
     description: AD Holdings Plc.
   "^adi,.*":
     description: Analog Devices, Inc.
+  "^adieng,.*":
+    description: ADI Engineering, Inc.
   "^advantech,.*":
     description: Advantech Corporation
   "^aeroflexgaisler,.*":
@@ -127,6 +129,8 @@ patternProperties:
     description: Arasan Chip Systems
   "^archermind,.*":
     description: ArcherMind Technology (Nanjing) Co., Ltd.
+  "^arcom,.*":
+    description: Arcom Controllers
   "^arctic,.*":
     description: Arctic Sand
   "^arcx,.*":
@@ -484,6 +488,8 @@ patternProperties:
     description: FocalTech Systems Co.,Ltd
   "^forlinx,.*":
     description: Baoding Forlinx Embedded Technology Co., Ltd.
+  "^freecom,.*":
+    description: Freecom Gmbh
   "^frida,.*":
     description: Shenzhen Frida LCD Co., Ltd.
   "^friendlyarm,.*":
@@ -496,6 +502,8 @@ patternProperties:
     description: FX Technology Ltd.
   "^gardena,.*":
     description: GARDENA GmbH
+  "^gateway,.*":
+    description: Gateway Communications
   "^gateworks,.*":
     description: Gateworks Corporation
   "^gcw,.*":
@@ -510,6 +518,8 @@ patternProperties:
     description: GE Fanuc Intelligent Platforms Embedded Systems, Inc.
   "^gemei,.*":
     description: Gemei Digital Technology Co., Ltd.
+  "^gemtek,.*":
+    description: Gemtek Technology Co., Ltd.
   "^genesys,.*":
     description: Genesys Logic, Inc.
   "^geniatech,.*":
@@ -530,6 +540,8 @@ patternProperties:
     description: Shenzhen Huiding Technology Co., Ltd.
   "^google,.*":
     description: Google, Inc.
+  "^goramo,.*":
+    description: Goramo Gorecki
   "^gplus,.*":
     description: GPLUS
   "^grinn,.*":
@@ -1444,6 +1456,8 @@ patternProperties:
     description: United Radiant Technology Corporation
   "^usi,.*":
     description: Universal Scientific Industrial Co., Ltd.
+  "^usr,.*":
+    description: U.S. Robotics Corporation
   "^utoo,.*":
     description: Aigo Digital Technology Co., Ltd.
   "^v3,.*":

-- 
2.41.0

[PATCH v2 2/2] dt-bindings: arm: List more IXP4xx devices

[Linus Walleij]

The ixp4xx bindings are lacking some of the devices we have
out there in the wild, so let's add them.

The "linksys,wrv54g", "gemtek,gtwx5715", "intel,ixp42x"
triplet is a pretty special case where the Gemtek device is
licensed as OEM product by Linksys (now Belkin) hence the
special entry for this one.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 .../devicetree/bindings/arm/intel-ixp4xx.yaml          | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml b/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
index 553dcbc70e35..1fecd4692a62 100644
--- a/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
+++ b/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
@@ -16,12 +16,30 @@ properties:
     oneOf:
       - items:
           - enum:
+              - adieng,coyote
+              - arcom,vulcan
+              - dlink,dsm-g600-a
+              - freecom,fsg-3
+              - gateway,7001
+              - gateworks,gw2348
+              - goramo,multilink-router
+              - intel,ixdp425
+              - intel,ixdpg425
+              - iom,nas-100d
               - linksys,nslu2
+              - netgear,wg302v1
+              - netgear,wg302v2
+              - usr,8200
               - welltech,epbx100
           - const: intel,ixp42x
+      - items:
+          - const: linksys,wrv54g
+          - const: gemtek,gtwx5715
+          - const: intel,ixp42x
       - items:
           - enum:
               - gateworks,gw2358
+              - intel,kixrp435
           - const: intel,ixp43x
 
 additionalProperties: true

-- 
2.41.0

Re: [PATCH v2 1/2] dt-bindings: Add vendor prefixes

[Conor Dooley]

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

On Mon, Sep 25, 2023 at 11:03:38AM +0200, Linus Walleij wrote:
> These vendor prefixes are used by some routers supported
> by e.g. OpenWrt.
> 
> - ADI Engineering is a US telecom equipment company.
> 
> - Arcom Controllers is a US manufacturer of repeaters.
> 
> - Freecom Gmbh is a german telecom equipment company.
> 
> - Gemtek Technology is a Taiwan telecom company.
> 
> - Gateway Communications was a telecommunication company,
>   now acquired by HKT Limited/PCCW.
> 
> - Goramo Gorecki is a privately owned Polish telecom
>   company.
> 
> - U.S. Robotics Corporation, known through their brand name
>   USRobotics is generally referred to as "USR" so use this
>   prefix for the company's device tree bindings.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

> ---
>  Documentation/devicetree/bindings/vendor-prefixes.yaml | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> index 573578db9509..edeb870c84cd 100644
> --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
> +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
> @@ -59,6 +59,8 @@ patternProperties:
>      description: AD Holdings Plc.
>    "^adi,.*":
>      description: Analog Devices, Inc.
> +  "^adieng,.*":
> +    description: ADI Engineering, Inc.
>    "^advantech,.*":
>      description: Advantech Corporation
>    "^aeroflexgaisler,.*":
> @@ -127,6 +129,8 @@ patternProperties:
>      description: Arasan Chip Systems
>    "^archermind,.*":
>      description: ArcherMind Technology (Nanjing) Co., Ltd.
> +  "^arcom,.*":
> +    description: Arcom Controllers
>    "^arctic,.*":
>      description: Arctic Sand
>    "^arcx,.*":
> @@ -484,6 +488,8 @@ patternProperties:
>      description: FocalTech Systems Co.,Ltd
>    "^forlinx,.*":
>      description: Baoding Forlinx Embedded Technology Co., Ltd.
> +  "^freecom,.*":
> +    description: Freecom Gmbh
>    "^frida,.*":
>      description: Shenzhen Frida LCD Co., Ltd.
>    "^friendlyarm,.*":
> @@ -496,6 +502,8 @@ patternProperties:
>      description: FX Technology Ltd.
>    "^gardena,.*":
>      description: GARDENA GmbH
> +  "^gateway,.*":
> +    description: Gateway Communications
>    "^gateworks,.*":
>      description: Gateworks Corporation
>    "^gcw,.*":
> @@ -510,6 +518,8 @@ patternProperties:
>      description: GE Fanuc Intelligent Platforms Embedded Systems, Inc.
>    "^gemei,.*":
>      description: Gemei Digital Technology Co., Ltd.
> +  "^gemtek,.*":
> +    description: Gemtek Technology Co., Ltd.
>    "^genesys,.*":
>      description: Genesys Logic, Inc.
>    "^geniatech,.*":
> @@ -530,6 +540,8 @@ patternProperties:
>      description: Shenzhen Huiding Technology Co., Ltd.
>    "^google,.*":
>      description: Google, Inc.
> +  "^goramo,.*":
> +    description: Goramo Gorecki
>    "^gplus,.*":
>      description: GPLUS
>    "^grinn,.*":
> @@ -1444,6 +1456,8 @@ patternProperties:
>      description: United Radiant Technology Corporation
>    "^usi,.*":
>      description: Universal Scientific Industrial Co., Ltd.
> +  "^usr,.*":
> +    description: U.S. Robotics Corporation
>    "^utoo,.*":
>      description: Aigo Digital Technology Co., Ltd.
>    "^v3,.*":
> 
> -- 
> 2.41.0
> 

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

Re: [PATCH v2 2/2] dt-bindings: arm: List more IXP4xx devices

[Conor Dooley]

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

On Mon, Sep 25, 2023 at 11:03:39AM +0200, Linus Walleij wrote:
> The ixp4xx bindings are lacking some of the devices we have
> out there in the wild, so let's add them.
> 
> The "linksys,wrv54g", "gemtek,gtwx5715", "intel,ixp42x"
> triplet is a pretty special case where the Gemtek device is
> licensed as OEM product by Linksys (now Belkin) hence the
> special entry for this one.
> 
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
>  .../devicetree/bindings/arm/intel-ixp4xx.yaml          | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml b/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
> index 553dcbc70e35..1fecd4692a62 100644
> --- a/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
> +++ b/Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
> @@ -16,12 +16,30 @@ properties:
>      oneOf:
>        - items:
>            - enum:
> +              - adieng,coyote
> +              - arcom,vulcan
> +              - dlink,dsm-g600-a
> +              - freecom,fsg-3
> +              - gateway,7001
> +              - gateworks,gw2348
> +              - goramo,multilink-router
> +              - intel,ixdp425
> +              - intel,ixdpg425
> +              - iom,nas-100d
>                - linksys,nslu2
> +              - netgear,wg302v1
> +              - netgear,wg302v2
> +              - usr,8200
>                - welltech,epbx100
>            - const: intel,ixp42x
> +      - items:
> +          - const: linksys,wrv54g
> +          - const: gemtek,gtwx5715
> +          - const: intel,ixp42x

One question, not so much about this particular case, but is there no
"standalone" version of the gtwx5715 sold by gemtek? Asking as I don't
see it in the enum above. The description sounds like it is both a
product in its own right & sold rebadged.

Thanks,
Conor.

>        - items:
>            - enum:
>                - gateworks,gw2358
> +              - intel,kixrp435
>            - const: intel,ixp43x
>  
>  additionalProperties: true
> 
> -- 
> 2.41.0
> 

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

Re: [PATCH v2 2/2] dt-bindings: arm: List more IXP4xx devices

[Linus Walleij]

On Tue, Sep 26, 2023 at 10:26 AM Conor Dooley <conor@kernel.org> wrote:

> > +      - items:
> > +          - const: linksys,wrv54g
> > +          - const: gemtek,gtwx5715
> > +          - const: intel,ixp42x
>
> One question, not so much about this particular case, but is there no
> "standalone" version of the gtwx5715 sold by gemtek? Asking as I don't
> see it in the enum above. The description sounds like it is both a
> product in its own right & sold rebadged.

Yeah this one is a special headache. It's two different brandings
of the same router. The Linksys version can still be bought new
from Amazon:
https://www.amazon.com/Cisco-Linksys-WRV54G-Wireless-G-VPN-Router/dp/B0000AR8Z1

I'm leaning toward listing them as two different devices instead
of what we have now, which is

  compatible = "linksys,wrv54g", "gemtek,gtwx5715", "intel,ixp42x";

We can just decide that one of them is the canon device, I guess
Linksys, and the other we can just use that device tree, or we
create a device tree that includes the former and just override
the compatible.

I don't really know what to do here.

Yours,
Linus Walleij

Re: [PATCH v2 2/2] dt-bindings: arm: List more IXP4xx devices

[Conor Dooley]

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

On Tue, Sep 26, 2023 at 11:04:26AM +0200, Linus Walleij wrote:
> On Tue, Sep 26, 2023 at 10:26 AM Conor Dooley <conor@kernel.org> wrote:
> 
> > > +      - items:
> > > +          - const: linksys,wrv54g
> > > +          - const: gemtek,gtwx5715
> > > +          - const: intel,ixp42x
> >
> > One question, not so much about this particular case, but is there no
> > "standalone" version of the gtwx5715 sold by gemtek? Asking as I don't
> > see it in the enum above. The description sounds like it is both a
> > product in its own right & sold rebadged.
> 
> Yeah this one is a special headache. It's two different brandings
> of the same router. The Linksys version can still be bought new
> from Amazon:
> https://www.amazon.com/Cisco-Linksys-WRV54G-Wireless-G-VPN-Router/dp/B0000AR8Z1
> 
> I'm leaning toward listing them as two different devices instead
> of what we have now, which is
> 
>   compatible = "linksys,wrv54g", "gemtek,gtwx5715", "intel,ixp42x";
> 
> We can just decide that one of them is the canon device, I guess
> Linksys, and the other we can just use that device tree, or we
> create a device tree that includes the former and just override
> the compatible.
> 
> I don't really know what to do here.

Ahh, you were intentionally doing this so that for both devices you
would list all 3 compatibles? I had it in my head that the OEM device
would have 2 compatibles & the rebadged one would have 3.
I'd probably be slightly in favour of your second option, since you'd
likely want to set the model too. I suppose it's the decision of the
maintainer for the platforms, which IIRC is you, as given the devices
differ only by the badge...

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

Re: [PATCH v2 2/2] dt-bindings: arm: List more IXP4xx devices

[Rob Herring]

On Tue, Sep 26, 2023 at 11:20:01AM +0100, Conor Dooley wrote:
> On Tue, Sep 26, 2023 at 11:04:26AM +0200, Linus Walleij wrote:
> > On Tue, Sep 26, 2023 at 10:26 AM Conor Dooley <conor@kernel.org> wrote:
> > 
> > > > +      - items:
> > > > +          - const: linksys,wrv54g
> > > > +          - const: gemtek,gtwx5715
> > > > +          - const: intel,ixp42x
> > >
> > > One question, not so much about this particular case, but is there no
> > > "standalone" version of the gtwx5715 sold by gemtek? Asking as I don't
> > > see it in the enum above. The description sounds like it is both a
> > > product in its own right & sold rebadged.
> > 
> > Yeah this one is a special headache. It's two different brandings
> > of the same router. The Linksys version can still be bought new
> > from Amazon:
> > https://www.amazon.com/Cisco-Linksys-WRV54G-Wireless-G-VPN-Router/dp/B0000AR8Z1
> > 
> > I'm leaning toward listing them as two different devices instead
> > of what we have now, which is
> > 
> >   compatible = "linksys,wrv54g", "gemtek,gtwx5715", "intel,ixp42x";
> > 
> > We can just decide that one of them is the canon device, I guess
> > Linksys, and the other we can just use that device tree, or we
> > create a device tree that includes the former and just override
> > the compatible.
> > 
> > I don't really know what to do here.
> 
> Ahh, you were intentionally doing this so that for both devices you
> would list all 3 compatibles? I had it in my head that the OEM device
> would have 2 compatibles & the rebadged one would have 3.
> I'd probably be slightly in favour of your second option, since you'd
> likely want to set the model too. I suppose it's the decision of the
> maintainer for the platforms, which IIRC is you, as given the devices
> differ only by the badge...

I would do a combination. Use the same compatible, but different "model" 
if you want to override it.

Rob