renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-22 12:33:59 +08:00
Code

ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled

Browse Source 
6e20a0a429
(gpio: pcf857x: enable gpio_to_irq() support) supports
gpio_to_irq() on pcf857x driver.
Now, we can use gpio-keys driver instead of gpio-keys-polled.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Kuninori Morimoto 2012-09-11 14:26:05 +09:00 committed by Linus Walleij
parent 3c0528810c
commit ee6691d74b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/kzm9g_defconfig
View File

@ -22,7 +22,6 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_DEADLINE is not set
# CONFIG_IOSCHED_CFQ is not set # CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_SHMOBILE=y
CONFIG_KEYBOARD_GPIO_POLLED=y
CONFIG_ARCH_SH73A0=y CONFIG_ARCH_SH73A0=y
CONFIG_MACH_KZM9G=y CONFIG_MACH_KZM9G=y
CONFIG_MEMORY_START=0x41000000 CONFIG_MEMORY_START=0x41000000
@ -70,6 +69,7 @@ CONFIG_INPUT_SPARSEKMAP=y
# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_MOUSEDEV is not set
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
# CONFIG_KEYBOARD_ATKBD is not set # CONFIG_KEYBOARD_ATKBD is not set
CONFIG_KEYBOARD_GPIO=y
# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_ST1232=y CONFIG_TOUCHSCREEN_ST1232=y

5
arch/arm/mach-shmobile/board-kzm9g.c
View File

@ -482,12 +482,10 @@ static struct gpio_keys_button gpio_buttons[] = {
static struct gpio_keys_platform_data gpio_key_info = { static struct gpio_keys_platform_data gpio_key_info = {
.buttons = gpio_buttons, .buttons = gpio_buttons,
.nbuttons = ARRAY_SIZE(gpio_buttons), .nbuttons = ARRAY_SIZE(gpio_buttons),
.poll_interval = 250, /* poling at this point */
}; };
static struct platform_device gpio_keys_device = { static struct platform_device gpio_keys_device = {
/* gpio-pcf857x.c driver doesn't support gpio_to_irq() */ .name = "gpio-keys",
.name = "gpio-keys-polled",
.dev = { .dev = {
.platform_data = &gpio_key_info, .platform_data = &gpio_key_info,
}, },
@ -550,6 +548,7 @@ static struct platform_device fsi_ak4648_device = {
/* I2C */ /* I2C */
static struct pcf857x_platform_data pcf8575_pdata = { static struct pcf857x_platform_data pcf8575_pdata = {
.gpio_base = GPIO_PCF8575_BASE, .gpio_base = GPIO_PCF8575_BASE,
.irq = intcs_evt2irq(0x3260), /* IRQ19 */
}; };
static struct i2c_board_info i2c0_devices[] = { static struct i2c_board_info i2c0_devices[] = {