From: Xu Jianqun Date: Wed, 6 Jan 2016 05:16:00 +0000 (+0800) Subject: input: keyboard: support rockchip key driver X-Git-Tag: firefly_0821_release~3522 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=37d86d3400d41440ba387269208031dd1033774b;p=firefly-linux-kernel-4.4.55.git input: keyboard: support rockchip key driver Change-Id: I2dcf473ec94b1be8d994698abff8633cb5e046c5 Signed-off-by: Xu Jianqun --- diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index d31134435587..b4b326bb4718 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -246,6 +246,7 @@ CONFIG_USB_SIERRA_NET=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_ROCKCHIP=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_JOYSTICK=y CONFIG_JOYSTICK_XPAD=y diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index ddd8148d51d7..56759912e9dd 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -630,6 +630,12 @@ config KEYBOARD_OMAP4 To compile this driver as a module, choose M here: the module will be called omap4-keypad. +config KEYBOARD_ROCKCHIP + tristate "Rockchip keyboard support" + depends on IIO && ARCH_ROCKCHIP + help + rk keyboard drivers(gpio and adc) + config KEYBOARD_SPEAR tristate "ST SPEAR keyboard support" depends on PLAT_SPEAR diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 1d416ddf84e4..42c5806d5bb6 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keypad.o obj-$(CONFIG_KEYBOARD_PXA930_ROTARY) += pxa930_rotary.o obj-$(CONFIG_KEYBOARD_QT1070) += qt1070.o obj-$(CONFIG_KEYBOARD_QT2160) += qt2160.o +obj-$(CONFIG_KEYBOARD_ROCKCHIP) += rk_keys.o obj-$(CONFIG_KEYBOARD_SAMSUNG) += samsung-keypad.o obj-$(CONFIG_KEYBOARD_SH_KEYSC) += sh_keysc.o obj-$(CONFIG_KEYBOARD_SNVS_PWRKEY) += snvs_pwrkey.o