| Message ID | 20200917165301.23100-3-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | gpio: add common dtschema | expand |
Hi Krzysztof, Thank you for the patch. On Thu, Sep 17, 2020 at 06:52:50PM +0200, Krzysztof Kozlowski wrote: > Include the common GPIO schema in GPIO controllers to be sure all common > properties are properly validated. Same comment as for patch 09/13, shouldn't we delete redundant properties from all these schemas ? > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > Changes since v1: > 1. Fix gpio-mxs.yaml > 2. Add snps,dw-apb-gpio.yaml > --- > .../devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/gpio-mxs.yaml | 4 ++++ > Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/gpio-rda.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/gpio-vf610.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml | 1 + > Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/sifive,gpio.yaml | 3 +++ > Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 3 +++ > .../devicetree/bindings/gpio/socionext,uniphier-gpio.yaml | 3 +++ > .../devicetree/bindings/gpio/xylon,logicvc-gpio.yaml | 3 +++ > 14 files changed, 41 insertions(+) > > diff --git a/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml b/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml > index c213cb9ddb9f..1ac69b9c03f9 100644 > --- a/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml > @@ -13,6 +13,9 @@ description: | > This controller is the Chip Common A GPIO present on a number of Broadcom > switch ASICs with integrated SoCs. > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > const: brcm,iproc-gpio-cca > diff --git a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml > index de0b9b5f6a70..737756e081fb 100644 > --- a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml > @@ -9,6 +9,9 @@ title: Freescale i.MX/MXC GPIO controller > maintainers: > - Anson Huang <Anson.Huang@nxp.com> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > oneOf: > diff --git a/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml b/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml > index dfa1133f8c5e..bd0c4f329625 100644 > --- a/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml > +++ b/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml > @@ -34,6 +34,10 @@ properties: > patternProperties: > "gpio@[0-9]+$": > type: object > + > + allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > enum: > diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml b/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml > index 338c5312a106..69b12041c893 100644 > --- a/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml > +++ b/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml > @@ -9,6 +9,9 @@ title: PCA9570 I2C GPO expander > maintainers: > - Sungbo Eo <mans0n@gorani.run> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > enum: > diff --git a/Documentation/devicetree/bindings/gpio/gpio-rda.yaml b/Documentation/devicetree/bindings/gpio/gpio-rda.yaml > index 6ece555f074f..d70c99f463c2 100644 > --- a/Documentation/devicetree/bindings/gpio/gpio-rda.yaml > +++ b/Documentation/devicetree/bindings/gpio/gpio-rda.yaml > @@ -9,6 +9,9 @@ title: RDA Micro GPIO controller > maintainers: > - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > const: rda,8810pl-gpio > diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml > index 6ac5a78ad3da..82f3e4b407d1 100644 > --- a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml > +++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml > @@ -17,6 +17,9 @@ description: | > Note: Each GPIO port should have an alias correctly numbered in "aliases" > node. > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > enum: > diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml b/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml > index 4db3b8a3332c..e2b7d2d133a8 100644 > --- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml > @@ -12,6 +12,7 @@ maintainers: > - Rob Herring <robh+dt@kernel.org> > > allOf: > + - $ref: gpio-common.yaml# > - if: > properties: > compatible: > diff --git a/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml b/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml > index 32a566ec3558..2eee374e8396 100644 > --- a/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml > @@ -13,6 +13,9 @@ description: | > Qualcomm Technologies Inc WCD9340/WCD9341 Audio Codec has integrated > gpio controller to control 5 gpios on the chip. > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > enum: > diff --git a/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml b/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml > index 8bdef812c87c..845689807678 100644 > --- a/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml > +++ b/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml > @@ -9,6 +9,9 @@ title: Renesas EMMA Mobile General Purpose I/O Interface > maintainers: > - Magnus Damm <magnus.damm@gmail.com> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > const: renesas,em-gio > diff --git a/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml b/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml > index 5026662e4508..c116000d579f 100644 > --- a/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml > @@ -9,6 +9,9 @@ title: Renesas R-Car General-Purpose Input/Output Ports (GPIO) > maintainers: > - Geert Uytterhoeven <geert+renesas@glider.be> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > oneOf: > diff --git a/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml b/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml > index a0efd8dc2538..f2d93b40fc7e 100644 > --- a/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml > @@ -10,6 +10,9 @@ maintainers: > - Yash Shah <yash.shah@sifive.com> > - Paul Walmsley <paul.walmsley@sifive.com> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > items: > diff --git a/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml b/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml > index b391cc1b4590..459aafe5fd47 100644 > --- a/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml > @@ -49,6 +49,9 @@ properties: > patternProperties: > "^gpio-(port|controller)@[0-9a-f]+$": > type: object > + allOf: > + - $ref: gpio-common.yaml# > + > properties: > compatible: > const: snps,dw-apb-gpio-port > diff --git a/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml b/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml > index c58ff9a94f45..94a911e9c313 100644 > --- a/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml > @@ -9,6 +9,9 @@ title: UniPhier GPIO controller > maintainers: > - Masahiro Yamada <yamada.masahiro@socionext.com> > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > $nodename: > pattern: "^gpio@[0-9a-f]+$" > diff --git a/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml b/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml > index a36aec27069c..0e4581241b3f 100644 > --- a/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml > +++ b/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml > @@ -23,6 +23,9 @@ description: | > - EN_VEE (power control) mapped to index 7 > - V_EN (power control) mapped to index 8 > > +allOf: > + - $ref: gpio-common.yaml# > + > properties: > $nodename: > pattern: "^gpio@[0-9a-f]+$"
diff --git a/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml b/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml index c213cb9ddb9f..1ac69b9c03f9 100644 --- a/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml @@ -13,6 +13,9 @@ description: | This controller is the Chip Common A GPIO present on a number of Broadcom switch ASICs with integrated SoCs. +allOf: + - $ref: gpio-common.yaml# + properties: compatible: const: brcm,iproc-gpio-cca diff --git a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml index de0b9b5f6a70..737756e081fb 100644 --- a/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml @@ -9,6 +9,9 @@ title: Freescale i.MX/MXC GPIO controller maintainers: - Anson Huang <Anson.Huang@nxp.com> +allOf: + - $ref: gpio-common.yaml# + properties: compatible: oneOf: diff --git a/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml b/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml index dfa1133f8c5e..bd0c4f329625 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-mxs.yaml @@ -34,6 +34,10 @@ properties: patternProperties: "gpio@[0-9]+$": type: object + + allOf: + - $ref: gpio-common.yaml# + properties: compatible: enum: diff --git a/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml b/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml index 338c5312a106..69b12041c893 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml @@ -9,6 +9,9 @@ title: PCA9570 I2C GPO expander maintainers: - Sungbo Eo <mans0n@gorani.run> +allOf: + - $ref: gpio-common.yaml# + properties: compatible: enum: diff --git a/Documentation/devicetree/bindings/gpio/gpio-rda.yaml b/Documentation/devicetree/bindings/gpio/gpio-rda.yaml index 6ece555f074f..d70c99f463c2 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-rda.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-rda.yaml @@ -9,6 +9,9 @@ title: RDA Micro GPIO controller maintainers: - Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> +allOf: + - $ref: gpio-common.yaml# + properties: compatible: const: rda,8810pl-gpio diff --git a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml index 6ac5a78ad3da..82f3e4b407d1 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml +++ b/Documentation/devicetree/bindings/gpio/gpio-vf610.yaml @@ -17,6 +17,9 @@ description: | Note: Each GPIO port should have an alias correctly numbered in "aliases" node. +allOf: + - $ref: gpio-common.yaml# + properties: compatible: enum: diff --git a/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml b/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml index 4db3b8a3332c..e2b7d2d133a8 100644 --- a/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml @@ -12,6 +12,7 @@ maintainers: - Rob Herring <robh+dt@kernel.org> allOf: + - $ref: gpio-common.yaml# - if: properties: compatible: diff --git a/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml b/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml index 32a566ec3558..2eee374e8396 100644 --- a/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml @@ -13,6 +13,9 @@ description: | Qualcomm Technologies Inc WCD9340/WCD9341 Audio Codec has integrated gpio controller to control 5 gpios on the chip. +allOf: + - $ref: gpio-common.yaml# + properties: compatible: enum: diff --git a/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml b/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml index 8bdef812c87c..845689807678 100644 --- a/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml +++ b/Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml @@ -9,6 +9,9 @@ title: Renesas EMMA Mobile General Purpose I/O Interface maintainers: - Magnus Damm <magnus.damm@gmail.com> +allOf: + - $ref: gpio-common.yaml# + properties: compatible: const: renesas,em-gio diff --git a/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml b/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml index 5026662e4508..c116000d579f 100644 --- a/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml @@ -9,6 +9,9 @@ title: Renesas R-Car General-Purpose Input/Output Ports (GPIO) maintainers: - Geert Uytterhoeven <geert+renesas@glider.be> +allOf: + - $ref: gpio-common.yaml# + properties: compatible: oneOf: diff --git a/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml b/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml index a0efd8dc2538..f2d93b40fc7e 100644 --- a/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml @@ -10,6 +10,9 @@ maintainers: - Yash Shah <yash.shah@sifive.com> - Paul Walmsley <paul.walmsley@sifive.com> +allOf: + - $ref: gpio-common.yaml# + properties: compatible: items: diff --git a/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml b/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml index b391cc1b4590..459aafe5fd47 100644 --- a/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml @@ -49,6 +49,9 @@ properties: patternProperties: "^gpio-(port|controller)@[0-9a-f]+$": type: object + allOf: + - $ref: gpio-common.yaml# + properties: compatible: const: snps,dw-apb-gpio-port diff --git a/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml b/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml index c58ff9a94f45..94a911e9c313 100644 --- a/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml @@ -9,6 +9,9 @@ title: UniPhier GPIO controller maintainers: - Masahiro Yamada <yamada.masahiro@socionext.com> +allOf: + - $ref: gpio-common.yaml# + properties: $nodename: pattern: "^gpio@[0-9a-f]+$" diff --git a/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml b/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml index a36aec27069c..0e4581241b3f 100644 --- a/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/xylon,logicvc-gpio.yaml @@ -23,6 +23,9 @@ description: | - EN_VEE (power control) mapped to index 7 - V_EN (power control) mapped to index 8 +allOf: + - $ref: gpio-common.yaml# + properties: $nodename: pattern: "^gpio@[0-9a-f]+$"
Include the common GPIO schema in GPIO controllers to be sure all common properties are properly validated. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- Changes since v1: 1. Fix gpio-mxs.yaml 2. Add snps,dw-apb-gpio.yaml --- .../devicetree/bindings/gpio/brcm,xgs-iproc-gpio.yaml | 3 +++ Documentation/devicetree/bindings/gpio/fsl-imx-gpio.yaml | 3 +++ Documentation/devicetree/bindings/gpio/gpio-mxs.yaml | 4 ++++ Documentation/devicetree/bindings/gpio/gpio-pca9570.yaml | 3 +++ Documentation/devicetree/bindings/gpio/gpio-rda.yaml | 3 +++ Documentation/devicetree/bindings/gpio/gpio-vf610.yaml | 3 +++ Documentation/devicetree/bindings/gpio/mrvl-gpio.yaml | 1 + Documentation/devicetree/bindings/gpio/qcom,wcd934x-gpio.yaml | 3 +++ Documentation/devicetree/bindings/gpio/renesas,em-gio.yaml | 3 +++ Documentation/devicetree/bindings/gpio/renesas,rcar-gpio.yaml | 3 +++ Documentation/devicetree/bindings/gpio/sifive,gpio.yaml | 3 +++ Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml | 3 +++ .../devicetree/bindings/gpio/socionext,uniphier-gpio.yaml | 3 +++ .../devicetree/bindings/gpio/xylon,logicvc-gpio.yaml | 3 +++ 14 files changed, 41 insertions(+)