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>
This commit is contained in:
parent
043916608c
commit
0f1142a514
|
@ -25,6 +25,7 @@
|
||||||
#include <linux/regulator/fixed.h>
|
#include <linux/regulator/fixed.h>
|
||||||
#include <linux/leds.h>
|
#include <linux/leds.h>
|
||||||
#include <linux/leds_pwm.h>
|
#include <linux/leds_pwm.h>
|
||||||
|
#include <linux/platform_data/omap4-keypad.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <asm/hardware/gic.h>
|
#include <asm/hardware/gic.h>
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
|
#include <linux/platform_data/omap4-keypad.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/irqs.h>
|
#include <mach/irqs.h>
|
||||||
|
|
|
@ -1,15 +1,6 @@
|
||||||
#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H
|
#ifndef ARCH_ARM_PLAT_OMAP4_KEYPAD_H
|
||||||
#define 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 *,
|
extern int omap4_keyboard_init(struct omap4_keypad_platform_data *,
|
||||||
struct omap_board_data *);
|
struct omap_board_data *);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -513,7 +513,6 @@ config KEYBOARD_OMAP
|
||||||
|
|
||||||
config KEYBOARD_OMAP4
|
config KEYBOARD_OMAP4
|
||||||
tristate "TI OMAP4 keypad support"
|
tristate "TI OMAP4 keypad support"
|
||||||
depends on ARCH_OMAP4
|
|
||||||
help
|
help
|
||||||
Say Y here if you want to use the OMAP4 keypad.
|
Say Y here if you want to use the OMAP4 keypad.
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
|
|
||||||
#include <plat/omap4-keypad.h>
|
#include <linux/platform_data/omap4-keypad.h>
|
||||||
|
|
||||||
/* OMAP4 registers */
|
/* OMAP4 registers */
|
||||||
#define OMAP4_KBD_REVISION 0x00
|
#define OMAP4_KBD_REVISION 0x00
|
||||||
|
|
13
include/linux/platform_data/omap4-keypad.h
Normal file
13
include/linux/platform_data/omap4-keypad.h
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
#ifndef __LINUX_INPUT_OMAP4_KEYPAD_H
|
||||||
|
#define __LINUX_INPUT_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;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* __LINUX_INPUT_OMAP4_KEYPAD_H */
|
Loading…
Reference in a new issue