| Message ID | 1347341165-15573-2-git-send-email-horms@verge.net.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0 > (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> Paul, Magnus - Simon wants me to merge this through the GPIO tree, can I have and ACK from one of the shmobile maintainers on that? Yours, Linus Walleij
On Tue, Sep 11, 2012 at 07:27:54PM +0200, Linus Walleij wrote: > On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote: > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0 > > (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> > > Paul, Magnus - Simon wants me to merge this through the > GPIO tree, can I have and ACK from one of the shmobile > maintainers on that? > Looks fine to me. Acked-by: Paul Mundt <lethal@linux-sh.org>
On Tue, Sep 11, 2012 at 7:26 AM, Simon Horman <horms@verge.net.au> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > 6e20a0a429bd4dc07d6de16d9c247270e04e4aa0 > (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> Applied, thanks! Linus Walleij
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 2388c86..175804e 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig @@ -22,7 +22,6 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set CONFIG_ARCH_SHMOBILE=y -CONFIG_KEYBOARD_GPIO_POLLED=y CONFIG_ARCH_SH73A0=y CONFIG_MACH_KZM9G=y CONFIG_MEMORY_START=0x41000000 @@ -70,6 +69,7 @@ CONFIG_INPUT_SPARSEKMAP=y # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ST1232=y diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 53b7ea9..4d1348e 100644 --- a/arch/arm/mach-shmobile/board-kzm9g.c +++ b/arch/arm/mach-shmobile/board-kzm9g.c @@ -482,12 +482,10 @@ static struct gpio_keys_button gpio_buttons[] = { static struct gpio_keys_platform_data gpio_key_info = { .buttons = gpio_buttons, .nbuttons = ARRAY_SIZE(gpio_buttons), - .poll_interval = 250, /* poling at this point */ }; static struct platform_device gpio_keys_device = { - /* gpio-pcf857x.c driver doesn't support gpio_to_irq() */ - .name = "gpio-keys-polled", + .name = "gpio-keys", .dev = { .platform_data = &gpio_key_info, }, @@ -550,6 +548,7 @@ static struct platform_device fsi_ak4648_device = { /* I2C */ static struct pcf857x_platform_data pcf8575_pdata = { .gpio_base = GPIO_PCF8575_BASE, + .irq = intcs_evt2irq(0x3260), /* IRQ19 */ }; static struct i2c_board_info i2c0_devices[] = {