| Message ID | 20230921-ixp4xx-gpio-clocks-v1-1-574942bf944a@linaro.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | gpio: ixp4xx: Handle external clock output | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 2 warnings, 78 lines checked |
| robh/patch-applied | success | |
| robh/dtbs-check | warning | build log |
| robh/dt-meta-schema | success |
On Thu, Sep 21, 2023 at 12:23:45AM +0200, Linus Walleij wrote: > This rewrites the IXP4xx GPIO bindings to use YAML schema, > and adds two new properties to enable fixed clock output on > pins 14 and 15. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > .../devicetree/bindings/gpio/intel,ixp4xx-gpio.txt | 38 ------------ > .../bindings/gpio/intel,ixp4xx-gpio.yaml | 70 ++++++++++++++++++++++ > MAINTAINERS | 2 +- > 3 files changed, 71 insertions(+), 39 deletions(-) > > diff --git a/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt b/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt > deleted file mode 100644 > index 8dc41ed99685..000000000000 > --- a/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt > +++ /dev/null > @@ -1,38 +0,0 @@ > -Intel IXP4xx XScale Networking Processors GPIO > - > -This GPIO controller is found in the Intel IXP4xx processors. > -It supports 16 GPIO lines. > - > -The interrupt portions of the GPIO controller is hierarchical: > -the synchronous edge detector is part of the GPIO block, but the > -actual enabling/disabling of the interrupt line is done in the > -main IXP4xx interrupt controller which has a 1:1 mapping for > -the first 12 GPIO lines to 12 system interrupts. > - > -The remaining 4 GPIO lines can not be used for receiving > -interrupts. > - > -The interrupt parent of this GPIO controller must be the > -IXP4xx interrupt controller. > - > -Required properties: > - > -- compatible : Should be > - "intel,ixp4xx-gpio" > -- reg : Should contain registers location and length > -- gpio-controller : marks this as a GPIO controller > -- #gpio-cells : Should be 2, see gpio/gpio.txt > -- interrupt-controller : marks this as an interrupt controller > -- #interrupt-cells : a standard two-cell interrupt, see > - interrupt-controller/interrupts.txt > - > -Example: > - > -gpio0: gpio@c8004000 { > - compatible = "intel,ixp4xx-gpio"; > - reg = <0xc8004000 0x1000>; > - gpio-controller; > - #gpio-cells = <2>; > - interrupt-controller; > - #interrupt-cells = <2>; > -}; > diff --git a/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml b/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml > new file mode 100644 > index 000000000000..bb1fc393bd8c > --- /dev/null > +++ b/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml > @@ -0,0 +1,70 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/gpio/intel,ixp4xx-gpio.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Intel IXP4xx XScale Networking Processors GPIO Controller > + > +description: This GPIO controller is found in the Intel IXP4xx > + processors. It supports 16 GPIO lines. > + The interrupt portions of the GPIO controller is hierarchical. > + The synchronous edge detector is part of the GPIO block, but the > + actual enabling/disabling of the interrupt line is done in the > + main IXP4xx interrupt controller which has a 1-to-1 mapping for > + the first 12 GPIO lines to 12 system interrupts. > + The remaining 4 GPIO lines can not be used for receiving > + interrupts. > + The interrupt parent of this GPIO controller must be the > + IXP4xx interrupt controller. > + GPIO 14 and 15 can be used as clock outputs rather than GPIO, > + and this can be enabled by a special flag. Do you care about the formatting here? If so, you are missing a '|'. If not, you have strange line breaks. > + > +maintainers: > + - Linus Walleij <linus.walleij@linaro.org> > + > +properties: > + compatible: > + const: intel,ixp4xx-gpio > + > + reg: > + maxItems: 1 > + > + gpio-controller: true Blank line between DT properties > + "#gpio-cells": > + const: 2 > + > + interrupt-controller: true Blank line > + "#interrupt-cells": > + const: 2 Otherwise, with those nits fixed: Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt b/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt deleted file mode 100644 index 8dc41ed99685..000000000000 --- a/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt +++ /dev/null @@ -1,38 +0,0 @@ -Intel IXP4xx XScale Networking Processors GPIO - -This GPIO controller is found in the Intel IXP4xx processors. -It supports 16 GPIO lines. - -The interrupt portions of the GPIO controller is hierarchical: -the synchronous edge detector is part of the GPIO block, but the -actual enabling/disabling of the interrupt line is done in the -main IXP4xx interrupt controller which has a 1:1 mapping for -the first 12 GPIO lines to 12 system interrupts. - -The remaining 4 GPIO lines can not be used for receiving -interrupts. - -The interrupt parent of this GPIO controller must be the -IXP4xx interrupt controller. - -Required properties: - -- compatible : Should be - "intel,ixp4xx-gpio" -- reg : Should contain registers location and length -- gpio-controller : marks this as a GPIO controller -- #gpio-cells : Should be 2, see gpio/gpio.txt -- interrupt-controller : marks this as an interrupt controller -- #interrupt-cells : a standard two-cell interrupt, see - interrupt-controller/interrupts.txt - -Example: - -gpio0: gpio@c8004000 { - compatible = "intel,ixp4xx-gpio"; - reg = <0xc8004000 0x1000>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; -}; diff --git a/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml b/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml new file mode 100644 index 000000000000..bb1fc393bd8c --- /dev/null +++ b/Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml @@ -0,0 +1,70 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/gpio/intel,ixp4xx-gpio.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Intel IXP4xx XScale Networking Processors GPIO Controller + +description: This GPIO controller is found in the Intel IXP4xx + processors. It supports 16 GPIO lines. + The interrupt portions of the GPIO controller is hierarchical. + The synchronous edge detector is part of the GPIO block, but the + actual enabling/disabling of the interrupt line is done in the + main IXP4xx interrupt controller which has a 1-to-1 mapping for + the first 12 GPIO lines to 12 system interrupts. + The remaining 4 GPIO lines can not be used for receiving + interrupts. + The interrupt parent of this GPIO controller must be the + IXP4xx interrupt controller. + GPIO 14 and 15 can be used as clock outputs rather than GPIO, + and this can be enabled by a special flag. + +maintainers: + - Linus Walleij <linus.walleij@linaro.org> + +properties: + compatible: + const: intel,ixp4xx-gpio + + reg: + maxItems: 1 + + gpio-controller: true + "#gpio-cells": + const: 2 + + interrupt-controller: true + "#interrupt-cells": + const: 2 + + intel,ixp4xx-gpio14-clkout: + description: If defined, enables clock output on GPIO 14 + instead of GPIO. + type: boolean + + intel,ixp4xx-gpio15-clkout: + description: If defined, enables clock output on GPIO 15 + instead of GPIO. + type: boolean + +required: + - compatible + - reg + - "#gpio-cells" + - interrupt-controller + - "#interrupt-cells" + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + gpio@c8004000 { + compatible = "intel,ixp4xx-gpio"; + reg = <0xc8004000 0x1000>; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; + }; diff --git a/MAINTAINERS b/MAINTAINERS index 90f13281d297..4e216887eb76 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2215,7 +2215,7 @@ M: Krzysztof Halasa <khalasa@piap.pl> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml -F: Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt +F: Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml F: Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml F: Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion* F: Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
This rewrites the IXP4xx GPIO bindings to use YAML schema, and adds two new properties to enable fixed clock output on pins 14 and 15. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- .../devicetree/bindings/gpio/intel,ixp4xx-gpio.txt | 38 ------------ .../bindings/gpio/intel,ixp4xx-gpio.yaml | 70 ++++++++++++++++++++++ MAINTAINERS | 2 +- 3 files changed, 71 insertions(+), 39 deletions(-)