diff options
| author | Robin Gong <yibin.gong@nxp.com> | 2017-03-17 10:14:13 +0800 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-09 22:19:01 +0800 |
| commit | 8bb0463ef6e138dc0844c4a2eb2257ce088839f4 (patch) | |
| tree | f37255db2ad67a62cc5cf02f6db58b496aac233b /arch | |
| parent | ee748474fea65f3630972760eeebe0b3f7222d42 (diff) | |
MLK-14619 input: keyboard: rpmsg-keys: add rpmsg-keys driver
Add rpmsg-keys driver on i.mx7ulp-evk board since vol+/vol- keys
are connected on m4 side and have to get the status of keys by
rpmsg.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
[Irina: updated for 4.9 APIs]
Signed-off-by: Irina Tirdea <irina.tirdea@nxp.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk.dts | 20 | ||||
| -rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 1 |
2 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx7ulp-evk.dts b/arch/arm/boot/dts/imx7ulp-evk.dts index 5bcde52d6c30..53b4b95cc98c 100644 --- a/arch/arm/boot/dts/imx7ulp-evk.dts +++ b/arch/arm/boot/dts/imx7ulp-evk.dts @@ -10,6 +10,7 @@ /dts-v1/; #include "imx7ulp.dtsi" +#include <dt-bindings/input/input.h> / { model = "NXP i.MX7ULP EVK"; @@ -174,6 +175,20 @@ status = "okay"; }; + rpmsg_keys: rpmsg-keys { + compatible = "fsl,rpmsg-keys"; + + volume-up { + label = "Volume Up"; + linux,code = <KEY_VOLUMEUP>; + }; + + volume-down { + label = "Volume Down"; + linux,code = <KEY_VOLUMEDOWN>; + }; + }; + sound-rpmsg { compatible = "fsl,imx-audio-rpmsg"; model = "rpmsg-audio"; @@ -481,9 +496,10 @@ * --0x9FF20000~0x9FF2FFFF: pm * --0x9FF30000~0x9FF3FFFF: audio * --0x9FF40000~0x9FF4FFFF: virtual tty + * --0x9FF50000~0x9FF5FFFF: keys */ - vdev-nums = <5>; - reg = <0x9FF00000 0x50000>; + vdev-nums = <6>; + reg = <0x9FF00000 0x60000>; status = "okay"; }; diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 10e6bd10b93b..7075478fb59d 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -155,6 +155,7 @@ CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcm/ZP_BCM4339/bcmdhd.ZP.OOB.cal" CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVBUG=m CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_RPMSG=y CONFIG_KEYBOARD_PF1550_ONKEY=y CONFIG_KEYBOARD_IMX=y CONFIG_MOUSE_PS2=m |