| Message ID | 20240921114813.4124-12-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 66239aa1cecfa25d89a6b5aff638ea275253efd6 |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | ARM: dts: renesas: bring genmai up to date - the easy stuff | expand |
On Sat, Sep 21, 2024 at 1:48 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> i.e. will queue in renesas-devel for v6.13... > --- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts > +++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts > @@ -58,6 +59,22 @@ partition@4000000 { > }; > }; > > + keyboard { > + compatible = "gpio-keys"; > + interrupt-parent = <&irqc>; ... with the interrupt-parent definition moved to the key-1 subnode. > + > + pinctrl-names = "default"; > + pinctrl-0 = <&keyboard_pins>; > + > + key-1 { > + /* JP3 must be set to 1-2 (default) */ > + interrupts = <6 IRQ_TYPE_EDGE_BOTH>; > + linux,code = <KEY_1>; > + label = "SW6,SW7"; > + wakeup-source; > + }; > + }; > + > leds { > status = "okay"; > compatible = "gpio-leds"; Gr{oetje,eeting}s, Geert
diff --git a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts index 4f920afe0d62..0ad3989859c4 100644 --- a/arch/arm/boot/dts/renesas/r7s72100-genmai.dts +++ b/arch/arm/boot/dts/renesas/r7s72100-genmai.dts @@ -9,6 +9,7 @@ /dts-v1/; #include "r7s72100.dtsi" #include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> #include <dt-bindings/pinctrl/r7s72100-pinctrl.h> / { @@ -58,6 +59,22 @@ partition@4000000 { }; }; + keyboard { + compatible = "gpio-keys"; + interrupt-parent = <&irqc>; + + pinctrl-names = "default"; + pinctrl-0 = <&keyboard_pins>; + + key-1 { + /* JP3 must be set to 1-2 (default) */ + interrupts = <6 IRQ_TYPE_EDGE_BOTH>; + linux,code = <KEY_1>; + label = "SW6,SW7"; + wakeup-source; + }; + }; + leds { status = "okay"; compatible = "gpio-leds"; @@ -201,6 +218,11 @@ i2c2_pins: i2c2 { pinmux = <RZA1_PINMUX(1, 4, 1)>, <RZA1_PINMUX(1, 5, 1)>; }; + keyboard_pins: keyboard { + /* P3_1 as IRQ6 */ + pinmux = <RZA1_PINMUX(3, 1, 3)>; + }; + scif2_pins: serial2 { /* P3_0 as TxD2; P3_2 as RxD2 */ pinmux = <RZA1_PINMUX(3, 0, 6)>, <RZA1_PINMUX(3, 2, 4)>;
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)