Skip to contentSkip to conversation

fix all errors except one reported by dt_binding_check

PATCH Applied Zhen Lei 5 participants 25 messages Oct 13, 2020 – Dec 4, 2020

Subsystems (5)

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore

Zhen Lei

author
#0 lore raw

cover fix all errors except one reported by dt_binding_check

When people add multiple or common YAML files, they usually perform a full dt_binding_check. Unfortunately, some YAML files cannot pass the self-check. The errors or warning are listed below. It is necessary to eliminate them, so that people's time and energy are not wasted every time when execute comprehensive dt_binding_check.

This error is fixed by Patch 1:
/root/leizhen/linux-next/Documentation/devicetree/bindings/leds/leds-lp55xx.example.dt.yaml: led-controller@33: multi-led@2:color:0:0: 9 is greater than the maximum of 8
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/leds/leds-lp55xx.yaml

These errors are fixed by Patch 2:
/root/leizhen/linux-next/Documentation/devicetree/bindings/chrome/google,cros-ec-typec.example.dt.yaml: ec@0: 'typec' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
/root/leizhen/linux-next/Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.example.dt.yaml: cros-ec@0: 'extcon0', 'extcon1' do not match any of the regexes: 'pinctrl-[0-9]+'
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
/root/leizhen/linux-next/Documentation/devicetree/bindings/pwm/google,cros-ec-pwm.example.dt.yaml: cros-ec@0: 'ec-pwm' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
/root/leizhen/linux-next/Documentation/devicetree/bindings/regulator/google,cros-ec-regulator.example.dt.yaml: ec@0: '#address-cells', '#size-cells', 'regulator@0' do not match any of the regexes: 'pinctrl-[0-9]+'
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml
/root/leizhen/linux-next/Documentation/devicetree/bindings/sound/google,cros-ec-codec.example.dt.yaml: cros-ec@0: '#address-cells', '#size-cells', 'ec-codec@10500000' do not match any of the regexes: 'pinctrl-[0-9]+'
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/mfd/google,cros-ec.yaml

These errors are fixed by Patch 3 and 4:
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.example.dts:21.13-30.11: Warning (spi_bus_bridge): /example-0/spi: incorrect #address-cells for SPI bus Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.example.dts:21.13-30.11: Warning (spi_bus_bridge): /example-0/spi: incorrect #size-cells for SPI bus Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.example.dt.yaml: Warning (spi_bus_reg): Failed prerequisite 'spi_bus_bridge'

Patch 5 and 6 fix the dtbs_check errors detected by Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus
also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus
also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dtb: Warning (spi_bus_reg): Failed prerequisite 'spi_bus_bridge' arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus
also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus
also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: Warning (spi_bus_reg): Failed prerequisite 'spi_bus_bridge' /root/leizhen/linux-next/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: slave: 'cmd-gpios' is a required property
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml
/root/leizhen/linux-next/arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: slave: 'cmd-gpio' does not match any of the regexes: 'pinctrl-[0-9]+'
From schema: /root/leizhen/linux-next/Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml

I have no good idea for this one, so leave it.
Documentation/devicetree/bindings/pci/xilinx-versal-cpm.example.dts:43.62-47.30: Warning (pci_device_reg): /example-0/versal/pcie@fca10000/interrupt-controller: missing PCI reg property

Zhen Lei (6):
dt-bindings: leds: choose correct color value of multi-led
dt-bindings: mfd: google,cros-ec: explicitly allow additional
properties
spi: dt-bindings: spi-controller: explicitly require
#address-cells=<0> for slave mode
dt-bindings: misc: explicitly add #address-cells for slave mode
ARM: dts: mmp2-olpc-xo-1-75: explicitly add #address-cells=<0> for
slave mode
dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

 .../devicetree/bindings/leds/leds-lp55xx.yaml        |  2 +-
 .../devicetree/bindings/mfd/google,cros-ec.yaml      |  2 +-
 .../devicetree/bindings/misc/olpc,xo1.75-ec.yaml     |  8 +++++---
 .../devicetree/bindings/spi/spi-controller.yaml      | 20 ++++++++++++++------
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts              |  2 +-
 5 files changed, 22 insertions(+), 12 deletions(-)
Signature · 1 line
1.8.3
author
#1 lore raw

PATCH 1/6 dt-bindings: leds: choose correct color value of multi-led

The color value of multi-led is fixed to "const: 8 #LED_COLOR_ID_MULTI", which is required by leds-class-multicolor.yaml.

---
 Documentation/devicetree/bindings/leds/leds-lp55xx.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +1 -1
index 58e974793a7976b..cd877e817ad1a1c 100644
@@ -197,7 +197,7 @@ examples:
                #address-cells = <1>;
                #size-cells = <0>;
                reg = <0x2>;
-               color = <LED_COLOR_ID_RGB>;
+               color = <LED_COLOR_ID_MULTI>;
                function = LED_FUNCTION_STANDBY;
                linux,default-trigger = "heartbeat";
 
Signature · 1 line
1.8.3
#2 lore raw

Re: [PATCH 1/6] dt-bindings: leds: choose correct color value of multi-led

Zhen

Quoted 13 lines · Zhen Lei

The color value of multi-led is fixed to "const: 8 #LED_COLOR_ID_MULTI", which is required by leds-class-multicolor.yaml.

---
  Documentation/devicetree/bindings/leds/leds-lp55xx.yaml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +0 -0
index 58e974793a7976b..cd877e817ad1a1c 100644

Documentation/devicetree/bindings/leds/leds-lp55xx.yaml examples: · line 203

Quoted 8 lines
Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +1 -1
@@ -197,7 +197,7 @@ examples:
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x2>;
-               color = <LED_COLOR_ID_RGB>;
+               color = <LED_COLOR_ID_MULTI>;
                 function = LED_FUNCTION_STANDBY;
                 linux,default-trigger = "heartbeat";
 

This is not correct.  ID_RGB is the correct variable here.

https://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/commit/?h=for-next&id=3d93edc77515c6f51fa9bbbe2185e2ec32bad024

Correct fix is to update the leds-class-multicolor.yaml

Dan

#3 lore raw

Re: [PATCH 1/6] dt-bindings: leds: choose correct color value of multi-led

Hi!

Quoted 13 lines

Documentation/devicetree/bindings/leds/leds-lp55xx.yaml examples: · line 202

Quoted 10 lines
Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +1 -1
@@ -197,7 +197,7 @@ examples:
                 #address-cells = <1>;
                 #size-cells = <0>;
                 reg = <0x2>;
-               color = <LED_COLOR_ID_RGB>;
+               color = <LED_COLOR_ID_MULTI>;
                 function = LED_FUNCTION_STANDBY;
                 linux,default-trigger = "heartbeat";

This is not correct.  ID_RGB is the correct variable here.

Quoted 3 lines

https://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/commit/?h=for-next&id=3d93edc77515c6f51fa9bbbe2185e2ec32bad024

Correct fix is to update the leds-class-multicolor.yaml

Right. So lets not merge this one.

Best regards,
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
#4 lore raw

Re: [PATCH 1/6] dt-bindings: leds: choose correct color value of multi-led

In reply to Dan Murphy
Quoted 27 lines · Dan Murphy

Zhen

Quoted 20 lines · Zhen Lei

The color value of multi-led is fixed to "const: 8 #LED_COLOR_ID_MULTI", which is required by leds-class-multicolor.yaml.

---
  Documentation/devicetree/bindings/leds/leds-lp55xx.yaml | 2 +-

  1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/leds/leds-lp55xx.yaml +1 -1
index 58e974793a7976b..cd877e817ad1a1c 100644
@@ -197,7 +197,7 @@ examples:
                  #address-cells = <1>;
                  #size-cells = <0>;
                  reg = <0x2>;
-               color = <LED_COLOR_ID_RGB>;
+               color = <LED_COLOR_ID_MULTI>;
                  function = LED_FUNCTION_STANDBY;
                  linux,default-trigger = "heartbeat";
Quoted 1 line

This is not correct.  ID_RGB is the correct variable here.

Quoted 3 lines

https://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git/commit/?h=for-next&id=3d93edc77515c6f51fa9bbbe2185e2ec32bad024

Correct fix is to update the leds-class-multicolor.yaml

OK

Quoted 6 lines

Dan

.

author
#5 lore raw

PATCH 2/6 dt-bindings: mfd: google,cros-ec: explicitly allow additional properties

In reply to Zhen Lei

There are so many properties have not been described in this yaml file, and a lot of errors will be reported. Especially, some yaml files such as google,cros-ec-typec.yaml, extcon-usbc-cros-ec.yaml can not pass the self-check, because of the examples. So temporarily allow additional properties to keep the comprehensive dt_binding_check result clean.

---
 Documentation/devicetree/bindings/mfd/google,cros-ec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/mfd/google,cros-ec.yaml +1 -1
index f49c0d5d31ad20e..e18047583a0c8fa 100644
@@ -87,7 +87,7 @@ then:
     google,cros-ec-spi-msg-delay: false
     spi-max-frequency: false
 
-additionalProperties: false
+additionalProperties: true
 
 examples:
   # Example for I2C
Signature · 1 line
1.8.3
#6 lore raw

Re: [PATCH 2/6] dt-bindings: mfd: google,cros-ec: explicitly allow additional properties

Zhen

Quoted 5 lines · Zhen Lei

There are so many properties have not been described in this yaml file, and a lot of errors will be reported. Especially, some yaml files such as google,cros-ec-typec.yaml, extcon-usbc-cros-ec.yaml can not pass the self-check, because of the examples. So temporarily allow additional properties to keep the comprehensive dt_binding_check result clean.

My preference is to fix the binding to pass the checks and not just work around the issues. Working around the issues may mean the issues never get fixed.

Dan

#7 lore raw

Re: [PATCH 2/6] dt-bindings: mfd: google,cros-ec: explicitly allow additional properties

Quoted 10 lines · Dan Murphy

Zhen

Quoted 5 lines · Zhen Lei

There are so many properties have not been described in this yaml file, and a lot of errors will be reported. Especially, some yaml files such as google,cros-ec-typec.yaml, extcon-usbc-cros-ec.yaml can not pass the self-check, because of the examples. So temporarily allow additional properties to keep the comprehensive dt_binding_check result clean.

My preference is to fix the binding to pass the checks and not just work around the issues. Working around the issues may mean the issues never get fixed.

I agree with your first sentence:don't just work around the issues. But these errors are so annoying. Hope someone can add the description of the missing properties. I'm not familiar with this module anyway.

And I don't fully agree with your last sentence. After all, the main properties are listed, and the ones that are not listed should be minor ones.

Quoted 6 lines

Dan

.

maintainer
#8 lore raw

Re: [PATCH 2/6] dt-bindings: mfd: google,cros-ec: explicitly allow additional properties

In reply to Zhen Lei
Quoted 10 lines · Zhen Lei

There are so many properties have not been described in this yaml file, and a lot of errors will be reported. Especially, some yaml files such as google,cros-ec-typec.yaml, extcon-usbc-cros-ec.yaml can not pass the self-check, because of the examples. So temporarily allow additional properties to keep the comprehensive dt_binding_check result clean.

---
 Documentation/devicetree/bindings/mfd/google,cros-ec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

There's proper fixes for these under review.

Rob

#9 lore raw

Re: [PATCH 2/6] dt-bindings: mfd: google,cros-ec: explicitly allow additional properties

Quoted 7 lines · Rob Herring
Quoted 6 lines · Zhen Lei

There are so many properties have not been described in this yaml file, and a lot of errors will be reported. Especially, some yaml files such as google,cros-ec-typec.yaml, extcon-usbc-cros-ec.yaml can not pass the self-check, because of the examples. So temporarily allow additional properties to keep the comprehensive dt_binding_check result clean.

Quoted 6 lines
Quoted 4 lines
---
 Documentation/devicetree/bindings/mfd/google,cros-ec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

There's proper fixes for these under review.

That's a good news.

Quoted 5 lines

Rob

.

author
#10 lore raw

PATCH 3/6 spi: dt-bindings: spi-controller: explicitly require #address-cells=<0> for slave mode

In reply to Zhen Lei

scripts/dtc/checks.c:
if (get_property(node, "spi-slave"))

	spi_addr_cells = 0;
if (node_addr_cells(node) != spi_addr_cells)
	FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
if (node_size_cells(node) != 0)
	FAIL(c, dti, node, "incorrect #size-cells for SPI bus");

The above code in check_spi_bus_bridge() require that the number of address cells must be 0. So we should explicitly declare "#address-cells = <0>".

---
 .../devicetree/bindings/spi/spi-controller.yaml      | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/spi/spi-controller.yaml +14 -6
index 2b154803b181c8b..1b56d5e40f1fcde 100644
@@ -20,7 +20,7 @@ properties:
     pattern: "^spi(@.*|-[0-9a-f])*$"
 
   "#address-cells":
-    const: 1
+    enum: [0, 1]
 
   "#size-cells":
     const: 0
@@ -52,11 +52,19 @@ properties:
     description:
       The SPI controller acts as a slave, instead of a master.
 
-oneOf:
-  - required:
-      - "#address-cells"
-  - required:
-      - spi-slave
+allOf:
+  - if:
+      not:
+        required:
+          - spi-slave
+    then:
+      properties:
+        "#address-cells":
+          const: 1
+    else:
+      properties:
+        "#address-cells":
+          const: 0
 
 patternProperties:
   "^slave$":
Signature · 1 line
1.8.3
maintainer Applied
#11 lore raw

Re: [PATCH 3/6] spi: dt-bindings: spi-controller: explicitly require #address-cells=<0> for slave mode

Quoted 8 lines · Zhen Lei

scripts/dtc/checks.c:
if (get_property(node, "spi-slave"))

	spi_addr_cells = 0;
if (node_addr_cells(node) != spi_addr_cells)
	FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
if (node_size_cells(node) != 0)
	FAIL(c, dti, node, "incorrect #size-cells for SPI bus");
Quoted 8 lines

The above code in check_spi_bus_bridge() require that the number of address cells must be 0. So we should explicitly declare "#address-cells = <0>".

---
 .../devicetree/bindings/spi/spi-controller.yaml      | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Applied, thanks!

Note that I tried fixing this in dtc, but that was rejected. So this gets the schema in sync with dtc.

Rob

author
#12 lore raw

PATCH 4/6 dt-bindings: misc: explicitly add #address-cells for slave mode

In reply to Zhen Lei

Explicitly add "#address-cells = <0>" and "#size-cells = <0>" to eliminate below warnings.

(spi_bus_bridge): /example-0/spi: incorrect #address-cells for SPI bus (spi_bus_bridge): /example-0/spi: incorrect #size-cells for SPI bus (spi_bus_reg): Failed prerequisite 'spi_bus_bridge'

---
 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +2 -0
index ade733cd60f7925..b3c45c046ba5e37 100644
@@ -42,6 +42,8 @@ examples:
 
     spi {
       spi-slave;
+      #address-cells = <0>;
+      #size-cells = <0>;
       ready-gpios = <&gpio 125 GPIO_ACTIVE_HIGH>;
 
       slave {
Signature · 1 line
1.8.3
maintainer Applied
#13 lore raw

Re: [PATCH 4/6] dt-bindings: misc: explicitly add #address-cells for slave mode

Quoted 12 lines · Zhen Lei

Explicitly add "#address-cells = <0>" and "#size-cells = <0>" to eliminate below warnings.

(spi_bus_bridge): /example-0/spi: incorrect #address-cells for SPI bus (spi_bus_bridge): /example-0/spi: incorrect #size-cells for SPI bus (spi_bus_reg): Failed prerequisite 'spi_bus_bridge'

---
 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 2 ++
 1 file changed, 2 insertions(+)

Applied, thanks!

author
#14 lore raw

PATCH 5/6 ARM: dts: mmp2-olpc-xo-1-75: explicitly add #address-cells=<0> for slave mode

In reply to Zhen Lei

Delete the old property "#address-cells" and then explicitly add it with zero value. The value of "#size-cells" is already zero, so keep it no change.

---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +1 -1
index f1a41152e9dd70d..be88b6e551d58e9 100644
@@ -224,7 +224,7 @@
 
 &ssp3 {
 	/delete-property/ #address-cells;
-	/delete-property/ #size-cells;
+	#address-cells = <0>;
 	spi-slave;
 	status = "okay";
 	ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>;
Signature · 1 line
1.8.3
#15 lore raw

Re: [PATCH 5/6] ARM: dts: mmp2-olpc-xo-1-75: explicitly add #address-cells=<0> for slave mode

Hi Lubomir:
Can you review this patch? The results of all other patches are clear.

Quoted 23 lines · Zhen Lei

Delete the old property "#address-cells" and then explicitly add it with zero value. The value of "#size-cells" is already zero, so keep it no change.

---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +1 -1
index f1a41152e9dd70d..be88b6e551d58e9 100644
@@ -224,7 +224,7 @@
 
 &ssp3 {
 	/delete-property/ #address-cells;
-	/delete-property/ #size-cells;
+	#address-cells = <0>;
 	spi-slave;
 	status = "okay";
 	ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>;
#16 lore raw

Re: [PATCH 5/6] ARM: dts: mmp2-olpc-xo-1-75: explicitly add #address-cells=<0> for slave mode

In reply to Zhen Lei

Hi everybody:
Can somebody apply this patch? When I do any YAML dtbs_check on arm, below Warnings always reported.

arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #address-cells for SPI bus
also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2.dtsi:472.23-480.6: Warning (spi_bus_bridge): /soc/apb@d4000000/spi@d4037000: incorrect #size-cells for SPI bus
also defined at arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:225.7-237.3
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dt.yaml: Warning (spi_bus_reg): Failed prerequisite 'spi_bus_bridge'

Quoted 23 lines · Zhen Lei

Delete the old property "#address-cells" and then explicitly add it with zero value. The value of "#size-cells" is already zero, so keep it no change.

---
 arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts +1 -1
index f1a41152e9dd70d..be88b6e551d58e9 100644
@@ -224,7 +224,7 @@
 
 &ssp3 {
 	/delete-property/ #address-cells;
-	/delete-property/ #size-cells;
+	#address-cells = <0>;
 	spi-slave;
 	status = "okay";
 	ready-gpio = <&gpio 125 GPIO_ACTIVE_HIGH>;
author
#17 lore raw

PATCH 6/6 dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

In reply to Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

---
 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +3 -3
index b3c45c046ba5e37..c7a06a9650db2ed 100644
@@ -24,7 +24,7 @@ properties:
   compatible:
     const: olpc,xo1.75-ec
 
-  cmd-gpios:
+  cmd-gpio:
     description: GPIO uspecifier of the CMD pin
     maxItems: 1
 
@@ -32,7 +32,7 @@ properties:
 
 required:
   - compatible
-  - cmd-gpios
+  - cmd-gpio
 
 additionalProperties: false
 
@@ -49,7 +49,7 @@ examples:
       slave {
         compatible = "olpc,xo1.75-ec";
         spi-cpha;
-        cmd-gpios = <&gpio 155 GPIO_ACTIVE_HIGH>;
+        cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;
       };
     };
 
Signature · 1 line
1.8.3
#18 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

Zhen

Quoted 16 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

---
  Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +0 -0
index b3c45c046ba5e37..c7a06a9650db2ed 100644

Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml properties: · line 27

Quoted 5 lines
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +1 -1
@@ -24,7 +24,7 @@ properties:
    compatible:
      const: olpc,xo1.75-ec
 
-  cmd-gpios:
+  cmd-gpio:

Preference is gpios not gpio. But Rob H accept or reject

Dan

#19 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

Quoted 14 lines · Dan Murphy

Zhen

Quoted 11 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

---
  Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---

  1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +0 -0
index b3c45c046ba5e37..c7a06a9650db2ed 100644
@@ -24,7 +24,7 @@ properties:

    compatible:
      const: olpc,xo1.75-ec
  -  cmd-gpios:
+  cmd-gpio:

Preference is gpios not gpio. But Rob H accept or reject

Look at the search result below. It seems that the driver have not been merged into mainline. But the property name is really used as cmd-gpio at mmp2-olpc-xo-1-75.dts:235, I don't think the mmp2-olpc-xo-1-75.dts can make a mistake. Otherwise, the driver will not work properly. Meanwhile, Both names cmd-gpios and cmd-gpio seem to be in use. But I prefer cmd-gpio, after all, only one gpio is assigned now. The motorola,cmd-gpios add "s" because it contains 3 gpio.

Without this patch:
git grep -wn "cmd-gpios"
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml:27: cmd-gpios:
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml:35: - cmd-gpios
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml:52: cmd-gpios = <&gpio 155 GPIO_ACTIVE_HIGH>;
Documentation/devicetree/bindings/phy/phy-mapphone-mdm6600.txt:10:- motorola,cmd-gpios Three GPIOs to control the power state of the MDM6600
Documentation/devicetree/bindings/phy/phy-mapphone-mdm6600.txt:22: motorola,cmd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>,
arch/arm/boot/dts/motorola-mapphone-common.dtsi:78: motorola,cmd-gpios = <&gpio4 7 GPIO_ACTIVE_HIGH>,

git grep -wn "cmd-gpio"
Documentation/devicetree/bindings/leds/leds-ns2.txt:9:- cmd-gpio: Command LED GPIO. See OF device-tree GPIO specification. Documentation/devicetree/bindings/leds/leds-ns2.txt:12: the corresponding cmd-gpio/slow-gpio values. All the GPIO values combinations
Documentation/devicetree/bindings/leds/leds-ns2.txt:29: cmd-gpio = <&gpio0 30 0>;
arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts:90: cmd-gpio = <&pca9554 1 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts:100: cmd-gpio = <&pca9554 4 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/kirkwood-d2net.dts:29:                    cmd-gpio = <&gpio0 30 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/kirkwood-is2.dts:31:                      cmd-gpio = <&gpio0 30 0>;
arch/arm/boot/dts/kirkwood-ns2.dts:31:                      cmd-gpio = <&gpio0 30 0>;
arch/arm/boot/dts/kirkwood-ns2max.dts:50:                   cmd-gpio = <&gpio0 30 0>;
arch/arm/boot/dts/kirkwood-ns2mini.dts:51:                  cmd-gpio = <&gpio0 30 0>;
arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:                cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;
Quoted 10 lines

Dan

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

maintainer
#20 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

Quoted 29 lines · Leizhen (ThunderTown)
Quoted 14 lines · Dan Murphy

Zhen

Quoted 11 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

---
  Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---

  1 file changed, 3 insertions(+), 3 deletions(-)
Quoted 11 lines
Quoted 9 lines
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +0 -0
index b3c45c046ba5e37..c7a06a9650db2ed 100644
@@ -24,7 +24,7 @@ properties:

    compatible:
      const: olpc,xo1.75-ec
  -  cmd-gpios:
+  cmd-gpio:

Preference is gpios not gpio. But Rob H accept or reject

Quoted 1 line

Look at the search result below. It seems that the driver have not been merged into mainline.

Yes, in drivers/platform/olpc/olpc-xo175-ec.c.

Your mistake is the gpiod api takes just 'cmd' as the GPIO core handles both forms.

Quoted 4 lines

But the property name is really used as cmd-gpio at mmp2-olpc-xo-1-75.dts:235, I don't think the mmp2-olpc-xo-1-75.dts can make a mistake. Otherwise, the driver will not work properly. Meanwhile, Both names cmd-gpios and cmd-gpio seem to be in use. But I prefer cmd-gpio, after all, only one gpio is assigned now. The motorola,cmd-gpios add "s" because it contains 3 gpio.

The preference is it is always '-gpios' just like it's always 'interrupts' or 'clocks'.

However, whether to change this is really up to the OLPC folks. Given the driver has always supported both forms, it should be okay to change the dts. Though there could be other users besides the kernel.

Rob

#21 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

Quoted 30 lines · Rob Herring
Quoted 29 lines · Leizhen (ThunderTown)
Quoted 25 lines · Dan Murphy

Zhen

Quoted 16 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

---
  Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---

  1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +0 -0
index b3c45c046ba5e37..c7a06a9650db2ed 100644
@@ -24,7 +24,7 @@ properties:
Quoted 4 lines

    compatible:
      const: olpc,xo1.75-ec
  -  cmd-gpios:
+  cmd-gpio:

Preference is gpios not gpio. But Rob H accept or reject

Quoted 6 lines
Quoted 1 line

Look at the search result below. It seems that the driver have not been merged into mainline.

Yes, in drivers/platform/olpc/olpc-xo175-ec.c.

Your mistake is the gpiod api takes just 'cmd' as the GPIO core handles both forms.

OK, thanks for your information. I have found that it defined by gpio_suffixes[].

Quoted 6 lines
Quoted 5 lines

But the property name is really used as cmd-gpio at mmp2-olpc-xo-1-75.dts:235, I don't think the mmp2-olpc-xo-1-75.dts can make a mistake. Otherwise, the driver will not work properly. Meanwhile, Both names cmd-gpios and cmd-gpio seem to be in use. But I prefer cmd-gpio, after all, only one gpio is assigned now. The motorola,cmd-gpios add "s" because it contains 3 gpio.

Quoted 6 lines

The preference is it is always '-gpios' just like it's always 'interrupts' or 'clocks'.

However, whether to change this is really up to the OLPC folks. Given the driver has always supported both forms, it should be okay to change the dts. Though there could be other users besides the kernel.

If both "cmd-gpios" and "cmd-gpio" are supported, should we use enum to list both of them in yaml? or use patternProperties?

I'm going to send v2 based on this idea.

Quoted 5 lines

Rob

.

maintainer
#22 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

Quoted 52 lines · Leizhen (ThunderTown)
Quoted 30 lines · Rob Herring
Quoted 29 lines · Leizhen (ThunderTown)
Quoted 25 lines · Dan Murphy

Zhen

Quoted 16 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

---
  Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +0 -0
index b3c45c046ba5e37..c7a06a9650db2ed 100644

Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml properties: · line 27

Quoted 4 lines
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +1 -0
@@ -24,7 +24,7 @@ properties:
    compatible:
      const: olpc,xo1.75-ec
  -  cmd-gpios:
+  cmd-gpio:

Preference is gpios not gpio. But Rob H accept or reject

Quoted 6 lines
Quoted 1 line

Look at the search result below. It seems that the driver have not been merged into mainline.

Yes, in drivers/platform/olpc/olpc-xo175-ec.c.

Your mistake is the gpiod api takes just 'cmd' as the GPIO core handles both forms.

OK, thanks for your information. I have found that it defined by gpio_suffixes[].

Quoted 9 lines
Quoted 5 lines

But the property name is really used as cmd-gpio at mmp2-olpc-xo-1-75.dts:235, I don't think the mmp2-olpc-xo-1-75.dts can make a mistake. Otherwise, the driver will not work properly. Meanwhile, Both names cmd-gpios and cmd-gpio seem to be in use. But I prefer cmd-gpio, after all, only one gpio is assigned now. The motorola,cmd-gpios add "s" because it contains 3 gpio.

The preference is it is always '-gpios' just like it's always 'interrupts' or 'clocks'.

Quoted 6 lines
Quoted 3 lines

However, whether to change this is really up to the OLPC folks. Given the driver has always supported both forms, it should be okay to change the dts. Though there could be other users besides the kernel.

If both "cmd-gpios" and "cmd-gpio" are supported, should we use enum to list both of them in yaml? or use patternProperties?

No, we pick one or the other. Given Lubomir is okay with a dts change, we should use just 'cmd-gpios'.

Rob

Acked-by on v1 6/6
#23 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

In reply to Zhen Lei

Hi,

Quoted 7 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

Thanks for the patch.

I've sent out an equivalent one some time ago:
https://lore.kernel.org/lkml/[email protected]/

In any case, either is fine with me.

Quoted 39 lines
---
 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +3 -3
index b3c45c046ba5e37..c7a06a9650db2ed 100644
@@ -24,7 +24,7 @@ properties:
   compatible:
     const: olpc,xo1.75-ec
 
-  cmd-gpios:
+  cmd-gpio:
     description: GPIO uspecifier of the CMD pin
     maxItems: 1
 
@@ -32,7 +32,7 @@ properties:
 
 required:
   - compatible
-  - cmd-gpios
+  - cmd-gpio
 
 additionalProperties: false
 
@@ -49,7 +49,7 @@ examples:
       slave {
         compatible = "olpc,xo1.75-ec";
         spi-cpha;
-        cmd-gpios = <&gpio 155 GPIO_ACTIVE_HIGH>;
+        cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;
       };
     };
 
Signature · 1 line
1.8.3
#24 lore raw

Re: [PATCH 6/6] dt-bindings: misc: correct the property name cmd-gpios to cmd-gpio

Quoted 9 lines · Lubomir Rintel

Hi,

Quoted 6 lines · Zhen Lei

The property name used in arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts is cmd-gpio.

arch/arm/boot/dts/mmp2-olpc-xo-1-75.dts:235:
cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;

Quoted 8 lines
Quoted 1 line

Thanks for the patch.

I've sent out an equivalent one some time ago:
https://lore.kernel.org/lkml/[email protected]/

In any case, either is fine with me.

Geert Uytterhoeven just replied me that the *-gpio form is deprecated. So your patch is the correct one.

Quoted 50 lines
Quoted 39 lines
---
 Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/misc/olpc,xo1.75-ec.yaml +3 -3
index b3c45c046ba5e37..c7a06a9650db2ed 100644
@@ -24,7 +24,7 @@ properties:
   compatible:
     const: olpc,xo1.75-ec
 
-  cmd-gpios:
+  cmd-gpio:
     description: GPIO uspecifier of the CMD pin
     maxItems: 1
 
@@ -32,7 +32,7 @@ properties:
 
 required:
   - compatible
-  - cmd-gpios
+  - cmd-gpio
 
 additionalProperties: false
 
@@ -49,7 +49,7 @@ examples:
       slave {
         compatible = "olpc,xo1.75-ec";
         spi-cpha;
-        cmd-gpios = <&gpio 155 GPIO_ACTIVE_HIGH>;
+        cmd-gpio = <&gpio 155 GPIO_ACTIVE_HIGH>;
       };
     };
 
Signature · 1 line
1.8.3

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

.