diff options
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c index 773a2b95a4e0..0a43f3189c21 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[] = { | |||
482 | static struct gpio_keys_platform_data gpio_key_info = { | 482 | static struct gpio_keys_platform_data gpio_key_info = { |
483 | .buttons = gpio_buttons, | 483 | .buttons = gpio_buttons, |
484 | .nbuttons = ARRAY_SIZE(gpio_buttons), | 484 | .nbuttons = ARRAY_SIZE(gpio_buttons), |
485 | .poll_interval = 250, /* poling at this point */ | ||
486 | }; | 485 | }; |
487 | 486 | ||
488 | static struct platform_device gpio_keys_device = { | 487 | static struct platform_device gpio_keys_device = { |
489 | /* gpio-pcf857x.c driver doesn't support gpio_to_irq() */ | 488 | .name = "gpio-keys", |
490 | .name = "gpio-keys-polled", | ||
491 | .dev = { | 489 | .dev = { |
492 | .platform_data = &gpio_key_info, | 490 | .platform_data = &gpio_key_info, |
493 | }, | 491 | }, |
@@ -550,6 +548,7 @@ static struct platform_device fsi_ak4648_device = { | |||
550 | /* I2C */ | 548 | /* I2C */ |
551 | static struct pcf857x_platform_data pcf8575_pdata = { | 549 | static struct pcf857x_platform_data pcf8575_pdata = { |
552 | .gpio_base = GPIO_PCF8575_BASE, | 550 | .gpio_base = GPIO_PCF8575_BASE, |
551 | .irq = intcs_evt2irq(0x3260), /* IRQ19 */ | ||
553 | }; | 552 | }; |
554 | 553 | ||
555 | static struct i2c_board_info i2c0_devices[] = { | 554 | static struct i2c_board_info i2c0_devices[] = { |