From b048b30536e2b5d30fedf0de826ff98dc7ad835a Mon Sep 17 00:00:00 2001 From: Robin Gong <yibin.gong@nxp.com> Date: Fri, 6 Aug 2021 22:05:49 +0800 Subject: [PATCH] MLK-25678 arm64: dts: imx8ulp-evk: change ONOFF key to gpio key Since ONOFF key release status can't be detect on i.mx8ulp which means long press can't be detect in Android, use another gpio key PTF31(SW4) to sense ONOFF key. Besides, Vol+/- keys change to rpmsg key SW7/SW8 to meet the requirement of Android changing volume during low power audio playback while kernel maybe in suspend, and only PTF7(SW2) in APD side could wake up from DSM. So move Vol+/- to RTD domain. Signed-off-by: Robin Gong <yibin.gong@nxp.com> Reviewed-by: Jacky Bai <ping.bai@nxp.com> --- arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 32 +++++++------------ 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts index 3c20f1fd8f3fb..43e7a3b75cbd9 100644 --- a/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx8ulp-evk.dts @@ -22,31 +22,25 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpio_keys>; - volume-up { - label = "Volume Up"; - gpios = <&gpiof 7 GPIO_ACTIVE_LOW>; - linux,code = <KEY_VOLUMEUP>; - }; - - volume-down { - label = "Volume Down"; - gpios = <&gpiof 30 GPIO_ACTIVE_LOW>; - linux,code = <KEY_VOLUMEDOWN>; - }; - - volume-home { - label = "Volume Home"; + power-on { + label = "PowerOn"; gpios = <&gpiof 31 GPIO_ACTIVE_LOW>; - linux,code = <KEY_VOLUMEDOWN>; + linux,code = <KEY_POWER>; }; }; rpmsg_keys: rpmsg-keys { compatible = "fsl,rpmsg-keys"; - power-on { - label = "PowerOn"; - linux,code = <KEY_POWER>; + volume-up { + label = "VolumeUp"; + linux,code = <KEY_VOLUMEUP>; + rpmsg-key,wakeup; + }; + + volume-down { + label = "VolumeDown"; + linux,code = <KEY_VOLUMEDOWN>; rpmsg-key,wakeup; }; }; @@ -509,8 +503,6 @@ pinctrl_gpio_keys: gpiokeys { fsl,pins = < - MX8ULP_PAD_PTF7__PTF7 0x3 - MX8ULP_PAD_PTF30__PTF30 0x3 MX8ULP_PAD_PTF31__PTF31 0x3 >; }; -- GitLab