* [PATCH 0/2] dts: rza2mevb: Add IRQ pin controller for RZ/A2 @ 2019-06-04 20:09 Chris Brandt 2019-06-04 20:09 ` [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node Chris Brandt 2019-06-04 20:09 ` [PATCH 2/2] ARM: dts: rza2mevb: Add input switch Chris Brandt 0 siblings, 2 replies; 8+ messages in thread From: Chris Brandt @ 2019-06-04 20:09 UTC (permalink / raw) To: Simon Horman, Rob Herring, Mark Cc: Geert Uytterhoeven, devicetree, linux-renesas-soc, Chris Brandt The IRQ pin controller that was added for RZ/A1 is the exact same one that is in RZ/A2. So we only need to add it to the device tree. Tested on the RZ/A2M EVB board (after gathering all the appropirate patches from different maintainer trees) Chris Brandt (2): ARM: dts: r7s9210: Add IRQC device node ARM: dts: rza2mevb: Add input switch arch/arm/boot/dts/r7s9210-rza2mevb.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/r7s9210.dtsi | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+) -- 2.16.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node 2019-06-04 20:09 [PATCH 0/2] dts: rza2mevb: Add IRQ pin controller for RZ/A2 Chris Brandt @ 2019-06-04 20:09 ` Chris Brandt 2019-06-05 13:14 ` Geert Uytterhoeven 2019-06-04 20:09 ` [PATCH 2/2] ARM: dts: rza2mevb: Add input switch Chris Brandt 1 sibling, 1 reply; 8+ messages in thread From: Chris Brandt @ 2019-06-04 20:09 UTC (permalink / raw) To: Simon Horman, Rob Herring, Mark Cc: Geert Uytterhoeven, devicetree, linux-renesas-soc, Chris Brandt Enable support for the IRQC on RZ/A2M, which is a small front-end to the GIC. This allows to use up to 8 external interrupts with configurable sense select. Signed-off-by: Chris Brandt <chris.brandt@renesas.com> --- arch/arm/boot/dts/r7s9210.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm/boot/dts/r7s9210.dtsi b/arch/arm/boot/dts/r7s9210.dtsi index 3d0bbc1f4543..72b79770e336 100644 --- a/arch/arm/boot/dts/r7s9210.dtsi +++ b/arch/arm/boot/dts/r7s9210.dtsi @@ -473,6 +473,25 @@ reg = <0xfcfe8004 4>; }; + irqc: interrupt-controller@fcfef800 { + compatible = "renesas,r7s9210-irqc", + "renesas,rza1-irqc"; + #interrupt-cells = <2>; + #address-cells = <0>; + interrupt-controller; + reg = <0xfcfef800 0x6>; + interrupt-map = + <0 0 &gic GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>, + <1 0 &gic GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>, + <2 0 &gic GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>, + <3 0 &gic GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, + <4 0 &gic GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, + <5 0 &gic GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, + <6 0 &gic GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, + <7 0 &gic GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; + interrupt-map-mask = <7 0>; + }; + pinctrl: pin-controller@fcffe000 { compatible = "renesas,r7s9210-pinctrl"; reg = <0xfcffe000 0x1000>; -- 2.16.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node 2019-06-04 20:09 ` [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node Chris Brandt @ 2019-06-05 13:14 ` Geert Uytterhoeven 2019-06-06 8:42 ` Simon Horman 0 siblings, 1 reply; 8+ messages in thread From: Geert Uytterhoeven @ 2019-06-05 13:14 UTC (permalink / raw) To: Chris Brandt Cc: Simon Horman, Rob Herring, Mark Rutland, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux-Renesas On Tue, Jun 4, 2019 at 10:09 PM Chris Brandt <chris.brandt@renesas.com> wrote: > Enable support for the IRQC on RZ/A2M, which is a small front-end to the > GIC. This allows to use up to 8 external interrupts with configurable > sense select. > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node 2019-06-05 13:14 ` Geert Uytterhoeven @ 2019-06-06 8:42 ` Simon Horman 0 siblings, 0 replies; 8+ messages in thread From: Simon Horman @ 2019-06-06 8:42 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Chris Brandt, Rob Herring, Mark Rutland, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux-Renesas On Wed, Jun 05, 2019 at 03:14:17PM +0200, Geert Uytterhoeven wrote: > On Tue, Jun 4, 2019 at 10:09 PM Chris Brandt <chris.brandt@renesas.com> wrote: > > Enable support for the IRQC on RZ/A2M, which is a small front-end to the > > GIC. This allows to use up to 8 external interrupts with configurable > > sense select. > > > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, applied for inclusion in v5.3. ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: dts: rza2mevb: Add input switch 2019-06-04 20:09 [PATCH 0/2] dts: rza2mevb: Add IRQ pin controller for RZ/A2 Chris Brandt 2019-06-04 20:09 ` [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node Chris Brandt @ 2019-06-04 20:09 ` Chris Brandt 2019-06-05 13:19 ` Geert Uytterhoeven 2019-06-06 8:48 ` Simon Horman 1 sibling, 2 replies; 8+ messages in thread From: Chris Brandt @ 2019-06-04 20:09 UTC (permalink / raw) To: Simon Horman, Rob Herring, Mark Cc: Geert Uytterhoeven, devicetree, linux-renesas-soc, Chris Brandt Add support for input switch SW3 on the Renesas RZ/A2M EVB development board. Note that this uses the IRQ interrupt, as the RZ/A2 GPIO controller does not include interrupt support Signed-off-by: Chris Brandt <chris.brandt@renesas.com> --- arch/arm/boot/dts/r7s9210-rza2mevb.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/r7s9210-rza2mevb.dts b/arch/arm/boot/dts/r7s9210-rza2mevb.dts index 4baf4a965090..6049145c120c 100644 --- a/arch/arm/boot/dts/r7s9210-rza2mevb.dts +++ b/arch/arm/boot/dts/r7s9210-rza2mevb.dts @@ -9,6 +9,7 @@ /dts-v1/; #include "r7s9210.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/pinctrl/r7s9210-pinctrl.h> / { @@ -26,6 +27,21 @@ stdout-path = "serial0:115200n8"; }; + keyboard { + compatible = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&keyboard_pins>; + + key-3 { + interrupt-parent = <&irqc>; + interrupts = <0 IRQ_TYPE_EDGE_BOTH>; + linux,code = <KEY_3>; + label = "SW3"; + wakeup-source; + }; + }; + lbsc { #address-cells = <1>; #size-cells = <1>; @@ -121,6 +137,10 @@ <RZA2_PINMUX(PORTL, 1, 5)>; /* IRQ5 */ }; + keyboard_pins: keyboard { + pinmux = <RZA2_PINMUX(PORTJ, 1, 6)>; /* IRQ0 */ + }; + /* Serial Console */ scif4_pins: serial4 { pinmux = <RZA2_PINMUX(PORT9, 0, 4)>, /* TxD4 */ -- 2.16.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ARM: dts: rza2mevb: Add input switch 2019-06-04 20:09 ` [PATCH 2/2] ARM: dts: rza2mevb: Add input switch Chris Brandt @ 2019-06-05 13:19 ` Geert Uytterhoeven 2019-06-06 8:48 ` Simon Horman 1 sibling, 0 replies; 8+ messages in thread From: Geert Uytterhoeven @ 2019-06-05 13:19 UTC (permalink / raw) To: Chris Brandt Cc: Simon Horman, Rob Herring, Mark Rutland, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, Linux-Renesas On Tue, Jun 4, 2019 at 10:09 PM Chris Brandt <chris.brandt@renesas.com> wrote: > Add support for input switch SW3 on the Renesas RZ/A2M EVB > development board. > > Note that this uses the IRQ interrupt, as the RZ/A2 GPIO controller > does not include interrupt support > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ARM: dts: rza2mevb: Add input switch 2019-06-04 20:09 ` [PATCH 2/2] ARM: dts: rza2mevb: Add input switch Chris Brandt 2019-06-05 13:19 ` Geert Uytterhoeven @ 2019-06-06 8:48 ` Simon Horman 2019-06-06 13:42 ` Simon Horman 1 sibling, 1 reply; 8+ messages in thread From: Simon Horman @ 2019-06-06 8:48 UTC (permalink / raw) To: Chris Brandt Cc: Rob Herring, Mark Rutland, Geert Uytterhoeven, devicetree, linux-renesas-soc On Tue, Jun 04, 2019 at 03:09:14PM -0500, Chris Brandt wrote: > Add support for input switch SW3 on the Renesas RZ/A2M EVB > development board. > > Note that this uses the IRQ interrupt, as the RZ/A2 GPIO controller > does not include interrupt support > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> Thanks Chris, I have applied this for inclusion in v5.3. There was a minor conflict when applying the pinctl portion of the patch which I have resolved. The result is as follows. >From 198120684b54efe8de4309b359d1ed36fdefa68c Mon Sep 17 00:00:00 2001 From: Chris Brandt <chris.brandt@renesas.com> Date: Tue, 4 Jun 2019 15:09:14 -0500 Subject: [PATCH] ARM: dts: rza2mevb: Add input switch Add support for input switch SW3 on the Renesas RZ/A2M EVB development board. Note that this uses the IRQ interrupt, as the RZ/A2 GPIO controller does not include interrupt support Signed-off-by: Chris Brandt <chris.brandt@renesas.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> [simon: resolved minor merge conflict] Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- arch/arm/boot/dts/r7s9210-rza2mevb.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/r7s9210-rza2mevb.dts b/arch/arm/boot/dts/r7s9210-rza2mevb.dts index 991e09de1219..25dd813d966e 100644 --- a/arch/arm/boot/dts/r7s9210-rza2mevb.dts +++ b/arch/arm/boot/dts/r7s9210-rza2mevb.dts @@ -9,6 +9,7 @@ /dts-v1/; #include "r7s9210.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/pinctrl/r7s9210-pinctrl.h> / { @@ -29,6 +30,21 @@ reg = <0x40000000 0x00800000>; /* HyperRAM */ }; + keyboard { + compatible = "gpio-keys"; + + pinctrl-names = "default"; + pinctrl-0 = <&keyboard_pins>; + + key-3 { + interrupt-parent = <&irqc>; + interrupts = <0 IRQ_TYPE_EDGE_BOTH>; + linux,code = <KEY_3>; + label = "SW3"; + wakeup-source; + }; + }; + lbsc { #address-cells = <1>; #size-cells = <1>; @@ -57,6 +73,10 @@ }; &pinctrl { + keyboard_pins: keyboard { + pinmux = <RZA2_PINMUX(PORTJ, 1, 6)>; /* IRQ0 */ + }; + /* Serial Console */ scif4_pins: serial4 { pinmux = <RZA2_PINMUX(PORT9, 0, 4)>, /* TxD4 */ -- 2.11.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] ARM: dts: rza2mevb: Add input switch 2019-06-06 8:48 ` Simon Horman @ 2019-06-06 13:42 ` Simon Horman 0 siblings, 0 replies; 8+ messages in thread From: Simon Horman @ 2019-06-06 13:42 UTC (permalink / raw) To: Chris Brandt Cc: Rob Herring, Mark Rutland, Geert Uytterhoeven, devicetree, linux-renesas-soc On Thu, Jun 06, 2019 at 10:48:28AM +0200, Simon Horman wrote: > On Tue, Jun 04, 2019 at 03:09:14PM -0500, Chris Brandt wrote: > > Add support for input switch SW3 on the Renesas RZ/A2M EVB > > development board. > > > > Note that this uses the IRQ interrupt, as the RZ/A2 GPIO controller > > does not include interrupt support > > > > Signed-off-by: Chris Brandt <chris.brandt@renesas.com> > > Thanks Chris, > > I have applied this for inclusion in v5.3. > > There was a minor conflict when applying the pinctl portion > of the patch which I have resolved. The result is as follows. Scratch that, I was working in the wrong branch. I now have your patch cleanly applied for inclusion in v5.3. ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-06-06 13:42 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-06-04 20:09 [PATCH 0/2] dts: rza2mevb: Add IRQ pin controller for RZ/A2 Chris Brandt 2019-06-04 20:09 ` [PATCH 1/2] ARM: dts: r7s9210: Add IRQC device node Chris Brandt 2019-06-05 13:14 ` Geert Uytterhoeven 2019-06-06 8:42 ` Simon Horman 2019-06-04 20:09 ` [PATCH 2/2] ARM: dts: rza2mevb: Add input switch Chris Brandt 2019-06-05 13:19 ` Geert Uytterhoeven 2019-06-06 8:48 ` Simon Horman 2019-06-06 13:42 ` Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).