[v3,4/4] dt-bindings: gpio: gpio-vf610: fix iMX 7ULP compatible matching

Message ID 20200920195848.27075-4-krzk@kernel.org
State Accepted
Commit 1c36e50f05d93d5485202eed05e1743897a766f0
Headers show
Series
  • [v3,1/4] dt-bindings: gpio: pl061: add gpio-line-names
Related show

Commit Message

Krzysztof Kozlowski Sept. 20, 2020, 7:58 p.m.
The i.MX 7ULP DTSes use two compatibles so update the binding to fix
dtbs_check warnings like:

  arch/arm/boot/dts/imx7ulp-com.dt.yaml: gpio@40ae0000:
    compatible: ['fsl,imx7ulp-gpio', 'fsl,vf610-gpio'] is too long

  arch/arm/boot/dts/imx7ulp-com.dt.yaml: gpio@40ae0000:
    compatible: Additional items are not allowed ('fsl,vf610-gpio' was unexpected)

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

---

Changes since v2:
1. None, split from previous patchset using common GPIO schema

Changes since v1:
1. New patch
---
 Documentation/devicetree/bindings/gpio/gpio-vf610.yaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Comments

Rob Herring Sept. 23, 2020, 9:09 p.m. | #1
On Sun, 20 Sep 2020 21:58:48 +0200, Krzysztof Kozlowski wrote:
> The i.MX 7ULP DTSes use two compatibles so update the binding to fix

> dtbs_check warnings like:

> 

>   arch/arm/boot/dts/imx7ulp-com.dt.yaml: gpio@40ae0000:

>     compatible: ['fsl,imx7ulp-gpio', 'fsl,vf610-gpio'] is too long

> 

>   arch/arm/boot/dts/imx7ulp-com.dt.yaml: gpio@40ae0000:

>     compatible: Additional items are not allowed ('fsl,vf610-gpio' was unexpected)

> 

> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

> 

> ---

> 

> Changes since v2:

> 1. None, split from previous patchset using common GPIO schema

> 

> Changes since v1:

> 1. New patch

> ---

>  Documentation/devicetree/bindings/gpio/gpio-vf610.yaml | 8 +++++---

>  1 file changed, 5 insertions(+), 3 deletions(-)

> 


Reviewed-by: Rob Herring <robh@kernel.org>
Linus Walleij Sept. 29, 2020, 11:54 a.m. | #2
On Sun, Sep 20, 2020 at 9:59 PM Krzysztof Kozlowski <krzk@kernel.org> wrote:

> The i.MX 7ULP DTSes use two compatibles so update the binding to fix

> dtbs_check warnings like:

>

>   arch/arm/boot/dts/imx7ulp-com.dt.yaml: gpio@40ae0000:

>     compatible: ['fsl,imx7ulp-gpio', 'fsl,vf610-gpio'] is too long

>

>   arch/arm/boot/dts/imx7ulp-com.dt.yaml: gpio@40ae0000:

>     compatible: Additional items are not allowed ('fsl,vf610-gpio' was unexpected)

>

> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>


This patch doesn't apply to my tree linux-gpio "devel":

$ git am --signoff
./v3_20200920_krzk_dt_bindings_gpio_pl061_add_gpio_line_names.mbx
Applying: dt-bindings: gpio: gpio-vf610: fix iMX 7ULP compatible matching
error: Documentation/devicetree/bindings/gpio/gpio-vf610.yaml: does
not exist in index
Patch failed at 0001 dt-bindings: gpio: gpio-vf610: fix iMX 7ULP
compatible matching

Yours,
Linus Walleij

Patch

diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml
index 6ac5a78ad3da..19738a457a58 100644
--- a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml
+++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml
@@ -19,9 +19,11 @@  description: |
 
 properties:
   compatible:
-    enum:
-      - fsl,vf610-gpio
-      - fsl,imx7ulp-gpio
+    oneOf:
+      - const: fsl,vf610-gpio
+      - items:
+          - const: fsl,imx7ulp-gpio
+          - const: fsl,vf610-gpio
 
   reg:
     description: The first reg tuple represents the PORT module, the second tuple