| Message ID | 1445617532-10228-1-git-send-email-soren.brinkmann@xilinx.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Fri, Oct 23, 2015 at 9:25 AM, Soren Brinkmann <soren.brinkmann@xilinx.com> wrote: > GPIO can be used as interrupt-controller. Add the missing properties to > the GPIO node. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > --- > arch/arm/boot/dts/zynq-7000.dtsi | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi > index 1a5220e05109..fe1a5d0cf03b 100644 > --- a/arch/arm/boot/dts/zynq-7000.dtsi > +++ b/arch/arm/boot/dts/zynq-7000.dtsi > @@ -101,6 +101,8 @@ > #gpio-cells = <2>; > clocks = <&clkc 42>; > gpio-controller; > + interrupt-controller; > + #interrupt-cells = <2>; > interrupt-parent = <&intc>; > interrupts = <0 20 4>; > reg = <0xe000a000 0x1000>; > -- > 2.6.2.3.ga463a5b > > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Moritz Fischer <moritz.fischer@ettus.com> -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Oct 23, 2015 at 6:25 PM, Soren Brinkmann <soren.brinkmann@xilinx.com> wrote: > HW and driver support the GPIO as interrupt-controller. Document that in > the DT binding. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Patch subject augmented and applied. > +- interrupt-controller : Marks the device node as an interrupt controller. > +- #interrupt-cells : Should be 2. The first cell is the GPIO number. > + The second cell bits[3:0] is used to specify trigger type and level flags: > + 1 = low-to-high edge triggered. > + 2 = high-to-low edge triggered. > + 4 = active high level-sensitive. > + 8 = active low level-sensitive. If these can be or:ed together, e.g 3 = both edges, that needs to be documented. If they can't the current patch is fine I guess. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Oct 23, 2015 at 6:25 PM, Soren Brinkmann <soren.brinkmann@xilinx.com> wrote: > GPIO can be used as interrupt-controller. Add the missing properties to > the GPIO node. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/27/2015 05:04 PM, Linus Walleij wrote: > On Fri, Oct 23, 2015 at 6:25 PM, Soren Brinkmann > <soren.brinkmann@xilinx.com> wrote: > >> GPIO can be used as interrupt-controller. Add the missing properties to >> the GPIO node. >> >> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> Applied to zynq/dt. Thanks, Michal -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/23/2015 06:25 PM, Soren Brinkmann wrote: > GPIO can be used as interrupt-controller. Add the missing properties to > the GPIO node. > > Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> > --- > arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > index 857eda5c7217..200fb588d0f5 100644 > --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi > @@ -133,6 +133,8 @@ > clocks = <&misc_clk>; > interrupt-parent = <&gic>; > interrupts = <0 16 4>; > + interrupt-controller; > + #interrupt-cells = <2>; > reg = <0x0 0xff0a0000 0x1000>; > }; > > Applied. Thanks, Michal
diff --git a/Documentation/devicetree/bindings/gpio/gpio-zynq.txt b/Documentation/devicetree/bindings/gpio/gpio-zynq.txt index db4c6a663c03..7b542657f259 100644 --- a/Documentation/devicetree/bindings/gpio/gpio-zynq.txt +++ b/Documentation/devicetree/bindings/gpio/gpio-zynq.txt @@ -12,6 +12,13 @@ Required properties: - interrupts : Interrupt specifier (see interrupt bindings for details) - interrupt-parent : Must be core interrupt controller +- interrupt-controller : Marks the device node as an interrupt controller. +- #interrupt-cells : Should be 2. The first cell is the GPIO number. + The second cell bits[3:0] is used to specify trigger type and level flags: + 1 = low-to-high edge triggered. + 2 = high-to-low edge triggered. + 4 = active high level-sensitive. + 8 = active low level-sensitive. - reg : Address and length of the register set for the device Example: @@ -22,5 +29,7 @@ Example: gpio-controller; interrupt-parent = <&intc>; interrupts = <0 20 4>; + interrupt-controller; + #interrupt-cells = <2>; reg = <0xe000a000 0x1000>; };
HW and driver support the GPIO as interrupt-controller. Document that in the DT binding. Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> --- Documentation/devicetree/bindings/gpio/gpio-zynq.txt | 9 +++++++++ 1 file changed, 9 insertions(+)