diff options
| author | Felipe Balbi <balbi@ti.com> | 2012-03-16 22:47:48 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-16 22:49:46 -0700 |
| commit | 0f1142a514e101076bc01de2f93b242693d0f16f (patch) | |
| tree | 4cbc011165e9835d33bde8641114b3a8a86b0ce6 /arch | |
| parent | 043916608c4b309e98a1650520ed4e88ec5e9123 (diff) | |
| download | linux-3.10-0f1142a514e101076bc01de2f93b242693d0f16f.tar.gz linux-3.10-0f1142a514e101076bc01de2f93b242693d0f16f.tar.bz2 linux-3.10-0f1142a514e101076bc01de2f93b242693d0f16f.zip | |
Input: omap4-keypad - move platform_data to <linux/platform_data>
This patch allows us to drop the OMAP dependency from the OMAP4 keypad
driver.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap4-keypad.h | 9 |
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 4e9071589bf..d16902c9ee5 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -25,6 +25,7 @@ #include <linux/regulator/fixed.h> #include <linux/leds.h> #include <linux/leds_pwm.h> +#include <linux/platform_data/omap4-keypad.h> #include <mach/hardware.h> #include <asm/hardware/gic.h> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 283d11eae69..58e1d201732 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -17,6 +17,7 @@ #include <linux/err.h> #include <linux/slab.h> #include <linux/of.h> +#include <linux/platform_data/omap4-keypad.h> #include <mach/hardware.h> #include <mach/irqs.h> diff --git a/arch/arm/plat-omap/include/plat/omap4-keypad.h b/arch/arm/plat-omap/include/plat/omap4-keypad.h index 9fe6c878323..8ad0a377a54 100644 --- a/arch/arm/plat-omap/include/plat/omap4-keypad.h +++ b/arch/arm/plat-omap/include/plat/omap4-keypad.h @@ -1,15 +1,6 @@ #ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H #define ARCH_ARM_PLAT_OMAP4_KEYPAD_H -#include <linux/input/matrix_keypad.h> - -struct omap4_keypad_platform_data { - const struct matrix_keymap_data *keymap_data; - - u8 rows; - u8 cols; -}; - extern int omap4_keyboard_init(struct omap4_keypad_platform_data *, struct omap_board_data *); #endif |