'ethernet-port' node unit-addresses should be in hexadecimal. Some
instances have it correct, but fix the ones that don't.
Signed-off-by: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml | 2 +-
Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +-
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 6 +++---
Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml | 2 +-
Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml | 2 +-
Documentation/devicetree/bindings/net/ethernet-switch.yaml | 4 ++--
Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml b/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
index aa3162c74833..75d8138298fb 100644
--- a/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
+++ b/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
@@ -53,7 +53,7 @@ properties:
const: 0
patternProperties:
- "^port@[0-9]+$":
+ "^port@[0-9a-f]+$":
type: object
$ref: ethernet-controller.yaml#
diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml
index ec74a660beda..e6010821f86f 100644
--- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml
@@ -50,7 +50,7 @@ $defs:
const: 0
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-9a-f]+$":
description: Ethernet switch ports
$ref: dsa-port.yaml#
unevaluatedProperties: false
diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
index 20f7ba4e2203..5038818e9f2e 100644
--- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
@@ -157,7 +157,7 @@ patternProperties:
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-6]$":
type: object
additionalProperties: true
@@ -186,7 +186,7 @@ $defs:
patternProperties:
"^(ethernet-)?ports$":
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-6]$":
if:
required: [ ethernet ]
then:
@@ -212,7 +212,7 @@ $defs:
patternProperties:
"^(ethernet-)?ports$":
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-6]$":
if:
required: [ ethernet ]
then:
diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
index 6a4d90d550b6..9973d64f15a7 100644
--- a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml
@@ -39,7 +39,7 @@ patternProperties:
"^(ethernet-)?ports$":
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-7]$":
allOf:
- if:
properties:
diff --git a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml
index d179c6971193..9432565f4f5d 100644
--- a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml
@@ -77,7 +77,7 @@ patternProperties:
"^(ethernet-)?ports$":
additionalProperties: true
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-9]$":
allOf:
- if:
properties:
diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml
index f1b9075dc7fb..dcbffe19d71a 100644
--- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml
@@ -36,7 +36,7 @@ patternProperties:
const: 0
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-9a-f]+$":
type: object
description: Ethernet switch ports
@@ -58,7 +58,7 @@ $defs:
$ref: '#'
patternProperties:
- "^(ethernet-)?port@[0-9]+$":
+ "^(ethernet-)?port@[0-9a-f]+$":
description: Ethernet switch ports
$ref: ethernet-switch-port.yaml#
unevaluatedProperties: false
diff --git a/Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml b/Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
index b04ac4966608..f07ae3173b03 100644
--- a/Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
+++ b/Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml
@@ -86,7 +86,7 @@ properties:
const: 0
patternProperties:
- "^port@[0-9]+$":
+ "^port@[12]$":
type: object
description: CPSW external ports
--
2.42.0On Mon, Oct 16, 2023 at 04:44:22PM -0500, Rob Herring wrote: > 'ethernet-port' node unit-addresses should be in hexadecimal. Some > instances have it correct, but fix the ones that don't. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
On 17.10.2023 00:44, Rob Herring wrote: > 'ethernet-port' node unit-addresses should be in hexadecimal. Some > instances have it correct, but fix the ones that don't. > > Signed-off-by: Rob Herring <robh@kernel.org> > --- > Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml | 2 +- > Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- > Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 6 +++--- > Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml | 2 +- > Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml | 2 +- > Documentation/devicetree/bindings/net/ethernet-switch.yaml | 4 ++-- > Documentation/devicetree/bindings/net/ti,cpsw-switch.yaml | 2 +- > 7 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml b/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml > index aa3162c74833..75d8138298fb 100644 > --- a/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml > +++ b/Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml > @@ -53,7 +53,7 @@ properties: > const: 0 > > patternProperties: > - "^port@[0-9]+$": > + "^port@[0-9a-f]+$": > type: object > > $ref: ethernet-controller.yaml# > diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml > index ec74a660beda..e6010821f86f 100644 > --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml > @@ -50,7 +50,7 @@ $defs: > const: 0 > > patternProperties: > - "^(ethernet-)?port@[0-9]+$": > + "^(ethernet-)?port@[0-9a-f]+$": > description: Ethernet switch ports > $ref: dsa-port.yaml# > unevaluatedProperties: false > diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > index 20f7ba4e2203..5038818e9f2e 100644 > --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > @@ -157,7 +157,7 @@ patternProperties: > additionalProperties: true > > patternProperties: > - "^(ethernet-)?port@[0-9]+$": > + "^(ethernet-)?port@[0-6]$": You also restrict the pattern depending on how many ports the switch has. Shouldn't this be a separate patch or, at the least, mentioned on the patch log? Regardless: Acked-by: Arınç ÜNAL <arinc.unal@arinc9.com> Arınç
© 2016 - 2024 Red Hat, Inc.