Skip to contentSkip to conversation

dt-bindings: pinctrl: aspeed: Fix 'compatible' schema errors

PATCH In review Rob Herring 3 participants 6 messages Jul 15, 2019 – Jul 17, 2019

Subsystems (5)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 dt-bindings: pinctrl: aspeed: Fix 'compatible' schema errors

The Aspeed pinctl schema have errors in the 'compatible' schema:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2400-pinctrl', 'aspeed', 'g4-pinctrl'] has non-unique elements Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2500-pinctrl', 'aspeed', 'g5-pinctrl'] has non-unique elements

Flow style sequences have to be quoted if the vales contain ','. Fix this by using the more common one line per entry formatting.

Fixes 0a617de16730 ("dt-bindings: pinctrl: aspeed: Convert AST2500 bindings to json-schema")
Fixes 07457937bb5c ("dt-bindings: pinctrl: aspeed: Convert AST2400 bindings to json-schema")
Cc Andrew Jeffery <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Joel Stanley <[email protected]>
Cc linux-aspeed at lists.ozlabs.org
Cc linux-gpio at vger.kernel.org
Cc linux-arm-kernel at lists.infradead.org
---
 .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml   | 4 +++-
 .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +3 -1
index 61a110a7db8a..125599a2dc5e 100644
@@ -22,7 +22,9 @@ description: |+
 
 properties:
   compatible:
-    enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
+    enum:
+      - aspeed,ast2400-pinctrl
+      - aspeed,g4-pinctrl
 
 patternProperties:
   '^.*$':
Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml +3 -1
index cf561bd55128..a464cfa0cba3 100644
@@ -22,7 +22,9 @@ description: |+
 
 properties:
   compatible:
-    enum: [ aspeed,ast2500-pinctrl, aspeed,g5-pinctrl ]
+    enum:
+      - aspeed,ast2500-pinctrl
+      - aspeed,g5-pinctrl
   aspeed,external-nodes:
     minItems: 2
     maxItems: 2
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 14 lines · Rob Herring

The Aspeed pinctl schema have errors in the 'compatible' schema:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2400-pinctrl', 'aspeed', 'g4-pinctrl'] has non-unique elements Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2500-pinctrl', 'aspeed', 'g5-pinctrl'] has non-unique elements

Flow style sequences have to be quoted if the vales contain ','. Fix this by using the more common one line per entry formatting.

properties:
compatible:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml description: |+ · line 27

Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +3 -1
-    enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
+    enum:
+      - aspeed,ast2400-pinctrl
+      - aspeed,g4-pinctrl

Thanks for the fix. However, we've standardised on the first form for all of our device trees, so we can drop the second compatible string from the bindings.

I think Andrew already has a patch cooking to do this.

Cheers,

Joel

Acked-by on v1 1/1
#5 lore raw
In reply to Rob Herring
Quoted 15 lines · Rob Herring

The Aspeed pinctl schema have errors in the 'compatible' schema:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2400-pinctrl', 'aspeed', 'g4-pinctrl'] has non-unique elements Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2500-pinctrl', 'aspeed', 'g5-pinctrl'] has non-unique elements

Flow style sequences have to be quoted if the vales contain ','. Fix this by using the more common one line per entry formatting.

Fixes 0a617de16730 ("dt-bindings: pinctrl: aspeed: Convert AST2500

bindings to json-schema")

Fixes 07457937bb5c ("dt-bindings: pinctrl: aspeed: Convert AST2400
Quoted 8 lines

bindings to json-schema")

Quoted 47 lines
---
 .../devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml   | 4 +++-
 .../devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml index 61a110a7db8a..125599a2dc5e 100644
---
a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
+++
b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +3 -1
@@ -22,7 +22,9 @@ description: |+
 
 properties:
   compatible:
-    enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
+    enum:
+      - aspeed,ast2400-pinctrl
+      - aspeed,g4-pinctrl
 
 patternProperties:
   '^.*$':
(quoted diff) +0 -0

a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml index cf561bd55128..a464cfa0cba3 100644
---
a/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
+++
b/Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml

Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml +3 -1
@@ -22,7 +22,9 @@ description: |+
 
 properties:
   compatible:
-    enum: [ aspeed,ast2500-pinctrl, aspeed,g5-pinctrl ]
+    enum:
+      - aspeed,ast2500-pinctrl
+      - aspeed,g5-pinctrl
   aspeed,external-nodes:
     minItems: 2
     maxItems: 2
Signature · 1 line
2.20.1
#2 lore raw
In reply to Joel Stanley
Quoted 20 lines · Joel Stanley
Quoted 14 lines · Rob Herring

The Aspeed pinctl schema have errors in the 'compatible' schema:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2400-pinctrl', 'aspeed', 'g4-pinctrl'] has non-unique elements Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2500-pinctrl', 'aspeed', 'g5-pinctrl'] has non-unique elements

Flow style sequences have to be quoted if the vales contain ','. Fix this by using the more common one line per entry formatting.

properties:
compatible:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml description: |+ · line 27

Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +3 -1
-    enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
+    enum:
+      - aspeed,ast2400-pinctrl
+      - aspeed,g4-pinctrl
Quoted 5 lines

Thanks for the fix. However, we've standardised on the first form for all of our device trees, so we can drop the second compatible string from the bindings.

I think Andrew already has a patch cooking to do this.

Yes, I have a series in the works. Will send patches soon.

Andrew

author maintainer
#3 lore raw
In reply to Joel Stanley
Quoted 21 lines · Joel Stanley
Quoted 14 lines · Rob Herring

The Aspeed pinctl schema have errors in the 'compatible' schema:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2400-pinctrl', 'aspeed', 'g4-pinctrl'] has non-unique elements Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2500-pinctrl', 'aspeed', 'g5-pinctrl'] has non-unique elements

Flow style sequences have to be quoted if the vales contain ','. Fix this by using the more common one line per entry formatting.

properties:
compatible:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml description: |+ · line 27

Quoted 4 lines
Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +3 -1
-    enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
+    enum:
+      - aspeed,ast2400-pinctrl
+      - aspeed,g4-pinctrl
Quoted 3 lines

Thanks for the fix. However, we've standardised on the first form for all of our device trees, so we can drop the second compatible string from the bindings.

Doing that would introduce validation warnings until the dts file is updated. So we still need this change until that happens.

Rob

#4 lore raw
Quoted 22 lines · Rob Herring
Quoted 21 lines · Joel Stanley
Quoted 18 lines · Rob Herring

The Aspeed pinctl schema have errors in the 'compatible' schema:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2400-pinctrl', 'aspeed', 'g4-pinctrl'] has non-unique elements Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml: \
properties:compatible:enum: ['aspeed', 'ast2500-pinctrl', 'aspeed', 'g5-pinctrl'] has non-unique elements

Flow style sequences have to be quoted if the vales contain ','. Fix this by using the more common one line per entry formatting.

properties:
compatible:

Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml +3 -1
-    enum: [ aspeed,ast2400-pinctrl, aspeed,g4-pinctrl ]
+    enum:
+      - aspeed,ast2400-pinctrl
+      - aspeed,g4-pinctrl
Quoted 6 lines
Quoted 3 lines

Thanks for the fix. However, we've standardised on the first form for all of our device trees, so we can drop the second compatible string from the bindings.

Doing that would introduce validation warnings until the dts file is updated. So we still need this change until that happens.

My series takes care of that.

Andrew