twl4030 keypad irq & dependencies

Disable the TWL4030_MODIRQ_KEYPAD symbol and remove all its uses.
It's not needed any more now that platform_get_irq() works for
these keypad devices.

Also remove inappropriate board-specific Kconfig dependencies.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index d0de14272d20ec97de3164d0e56dbcd0617ea7a4..a3bbb078782a328b41c00f839ff194b4b7fd7e74 100644 (file)
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -182,7 +182,6 @@ static struct twl4030_keypad_data sdp2430_kp_data = {
        .keymap         = sdp2430_keymap,
        .keymapsize     = ARRAY_SIZE(sdp2430_keymap),
        .rep            = 1,
-       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
 static int __init msecure_init(void)

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 81a4711ce56cd0f8bb5e40cf57d1197b0e1786db..e2eed499fc28883c7264b39f306ec2d0ce9b4ec7 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -118,7 +118,6 @@ static struct twl4030_keypad_data sdp3430_kp_data = {
        .keymap         = sdp3430_keymap,
        .keymapsize     = ARRAY_SIZE(sdp3430_keymap),
        .rep            = 1,
-       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
 static int ts_gpio;

diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index bc66b28032c648ff73d23bf6903b37c7b6bd0d34..c8119a4d38f642f99a27de2fddd9d5359ddbaf10 100644 (file)
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -101,7 +101,6 @@ static struct twl4030_keypad_data ldp_kp_twl4030_data = {
        .keymap         = ldp_twl4030_keymap,
        .keymapsize     = ARRAY_SIZE(ldp_twl4030_keymap),
        .rep            = 1,
-       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
 static struct gpio_keys_button ldp_gpio_keys_buttons[] = {

diff --git a/arch/arm/mach-omap2/board-omap2evm.c b/arch/arm/mach-omap2/board-omap2evm.c
index e705e59c26d43c6ce9d483ef48276b0631774cc9..3925b189f965a81f1c4b8a8344c4c19871d6fa52 100644 (file)
--- a/arch/arm/mach-omap2/board-omap2evm.c
+++ b/arch/arm/mach-omap2/board-omap2evm.c
@@ -273,7 +273,6 @@ static struct twl4030_keypad_data omap2evm_kp_data = {
        .keymap         = omap2evm_keymap,
        .keymapsize     = ARRAY_SIZE(omap2evm_keymap),
        .rep            = 1,
-       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
 static void __init omap2_evm_init_irq(void)

diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 9e6a33e7e0a46557c44c05c7c797a66917dbab7d..b1dbe3eae4487ac0bb186deb1adb36dff8395b9a 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -125,7 +125,6 @@ static struct twl4030_keypad_data omap3evm_kp_data = {
        .keymap         = omap3evm_keymap,
        .keymapsize     = ARRAY_SIZE(omap3evm_keymap),
        .rep            = 1,
-       .irq            = TWL4030_MODIRQ_KEYPAD,
 };
 
 static struct twl4030_madc_platform_data omap3evm_madc_data = {

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c8abf13a4603764c4c10d7af25daaed8d8272023..c964badc4b5026b60988a20083f400ea602b0a98 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -261,7 +261,7 @@ config KEYBOARD_OMAP
 
 config KEYBOARD_TWL4030
        tristate "TI TWL4030 keypad support"
-       depends on TWL4030_CORE && (MACH_OMAP_2430SDP || MACH_OMAP2EVM || MACH_OMAP_3430SDP || MACH_OMAP3EVM || MACH_OMAP_LDP)
+       depends on TWL4030_CORE
        help
          Say Y here if you want to use the OMAP TWL4030 keypad.
 

diff --git a/drivers/input/keyboard/omap-twl4030keypad.c b/drivers/input/keyboard/omap-twl4030keypad.c
index 21f922de7a2079578fc1ac63e8f74120571ab619..8569e3bf800e5b7bc3fe172362bb527d644c3ea7 100644 (file)
--- a/drivers/input/keyboard/omap-twl4030keypad.c
+++ b/drivers/input/keyboard/omap-twl4030keypad.c
@@ -269,7 +269,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
        kp->keymapsize = pdata->keymapsize;
        kp->n_rows = pdata->rows;
        kp->n_cols = pdata->cols;
-       kp->irq = pdata->irq;
+       kp->irq = platform_get_irq(pdev, 0);
 
        /* setup input device */
        set_bit(EV_KEY, kp->omap_twl4030kp->evbit);

diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
index f60a0d8f57d7fcbdee16b481954e601d73e56cde..03a5b08efc26fc06d4a04e686d3e30a5bd332289 100644 (file)
--- a/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@ -259,7 +259,6 @@ struct twl4030_keypad_data {
        int rows;
        int cols;
        int *keymap;
-       int irq;
        unsigned int keymapsize;
        unsigned int rep:1;
 };
@@ -374,7 +373,7 @@ int twl4030_sih_setup(int module);
 /* TWL4030 interrupts */
 
 /* #define TWL4030_MODIRQ_GPIO         (TWL4030_IRQ_BASE + 0) */
-#define TWL4030_MODIRQ_KEYPAD          (TWL4030_IRQ_BASE + 1)
+/* #define TWL4030_MODIRQ_KEYPAD               (TWL4030_IRQ_BASE + 1) */
 #define TWL4030_MODIRQ_BCI             (TWL4030_IRQ_BASE + 2)
 #define TWL4030_MODIRQ_MADC            (TWL4030_IRQ_BASE + 3)
 /* #define TWL4030_MODIRQ_USB          (TWL4030_IRQ_BASE + 4) */