| Message ID | 20190807082556.5013-7-philippe.schenker@toradex.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Common patches from downstream development | expand |
On Wed, 2019-08-07 at 08:26 +0000, Philippe Schenker wrote: > From: Stefan Agner <stefan.agner@toradex.com> > > Add wakeup GPIO key which is able to wake the system from sleep > modes (e.g. Suspend-to-Memory). > > Signed-off-by: Stefan Agner <stefan.agner@toradex.com> > Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > > Changes in v3: None > Changes in v2: None > > arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 14 ++++++++++++++ > arch/arm/boot/dts/imx7-colibri.dtsi | 7 ++++++- > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > index 3f2746169181..d4dbc4fc1adf 100644 > --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi > @@ -52,6 +52,20 @@ > clock-frequency = <16000000>; > }; > > + gpio-keys { > + compatible = "gpio-keys"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_gpiokeys>; > + > + power { > + label = "Wake-Up"; > + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; > + linux,code = <KEY_WAKEUP>; > + debounce-interval = <10>; > + gpio-key,wakeup; > + }; > + }; > + > panel: panel { > compatible = "edt,et057090dhu"; > backlight = <&bl>; > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi > b/arch/arm/boot/dts/imx7-colibri.dtsi > index 2480623c92ff..16d1a1ed1aff 100644 > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > @@ -741,12 +741,17 @@ > > pinctrl_gpio_lpsr: gpio1-grp { > fsl,pins = < > - MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x59 > MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x59 > MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x59 > >; > }; > > + pinctrl_gpiokeys: gpiokeysgrp { > + fsl,pins = < > + MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x19 > + >; > + }; > + > pinctrl_i2c1: i2c1-grp { > fsl,pins = < > MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA 0x400 > 0007f
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi index 3f2746169181..d4dbc4fc1adf 100644 --- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi @@ -52,6 +52,20 @@ clock-frequency = <16000000>; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpiokeys>; + + power { + label = "Wake-Up"; + gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; + linux,code = <KEY_WAKEUP>; + debounce-interval = <10>; + gpio-key,wakeup; + }; + }; + panel: panel { compatible = "edt,et057090dhu"; backlight = <&bl>; diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 2480623c92ff..16d1a1ed1aff 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -741,12 +741,17 @@ pinctrl_gpio_lpsr: gpio1-grp { fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x59 MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2 0x59 MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3 0x59 >; }; + pinctrl_gpiokeys: gpiokeysgrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x19 + >; + }; + pinctrl_i2c1: i2c1-grp { fsl,pins = < MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA 0x4000007f