GPIO: KZM-A9-GT for 3.7

Hi Linus,

please consider the following GPIO enhancement for the kzm9g board for 3.7. As discussed previously it depends on changes in devel tree and thus seems to be appropriate to merge there.

----------------------------------------------------------------
The following changes since commit a3b930815d07e2a8a25e85496839f80facb3654d:

gpio: sx150x: Use irq_data_get_irq_chip_data() at appropriate places (2012-09-06 09:19:04 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git gpio

for you to fetch changes up to b7a3ce41bb1ca65954029fb002373524bafb3161:

ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled (2012-09-11 13:54:57 +0900)

----------------------------------------------------------------
Kuninori Morimoto (1):
ARM: shmobile: kzm9g: use gpio-keys instead of gpio-keys-polled

 arch/arm/configs/kzm9g_defconfig     |    2 +-
 arch/arm/mach-shmobile/board-kzm9g.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

From: Kuninori Morimoto <[email protected]>

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.

---
 arch/arm/configs/kzm9g_defconfig     |    2 +-
 arch/arm/mach-shmobile/board-kzm9g.c |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

index 2388c86..175804e 100644
@@ -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

index 53b7ea9..4d1348e 100644
@@ -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[] = {

1.7.10.4

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

Looks fine to me.

Applied, thanks!
Linus Walleij

I'll rather apply the raw patch, I'll comment on that one...

Yours,
Linus Walleij