diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-tegra/include/mach/kbc.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/keypad.h | 27 |
2 files changed, 2 insertions, 26 deletions
diff --git a/arch/arm/mach-tegra/include/mach/kbc.h b/arch/arm/mach-tegra/include/mach/kbc.h index 4f3572a1c684..20bb0545f992 100644 --- a/arch/arm/mach-tegra/include/mach/kbc.h +++ b/arch/arm/mach-tegra/include/mach/kbc.h | |||
@@ -53,6 +53,7 @@ struct tegra_kbc_platform_data { | |||
53 | struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO]; | 53 | struct tegra_kbc_pin_cfg pin_cfg[KBC_MAX_GPIO]; |
54 | const struct matrix_keymap_data *keymap_data; | 54 | const struct matrix_keymap_data *keymap_data; |
55 | 55 | ||
56 | u32 wakeup_key; | ||
56 | bool wakeup; | 57 | bool wakeup; |
57 | bool use_fn_map; | 58 | bool use_fn_map; |
58 | bool use_ghost_filter; | 59 | bool use_ghost_filter; |
diff --git a/arch/arm/plat-samsung/include/plat/keypad.h b/arch/arm/plat-samsung/include/plat/keypad.h index b59a6483cd8a..c81ace332a1e 100644 --- a/arch/arm/plat-samsung/include/plat/keypad.h +++ b/arch/arm/plat-samsung/include/plat/keypad.h | |||
@@ -13,32 +13,7 @@ | |||
13 | #ifndef __PLAT_SAMSUNG_KEYPAD_H | 13 | #ifndef __PLAT_SAMSUNG_KEYPAD_H |
14 | #define __PLAT_SAMSUNG_KEYPAD_H | 14 | #define __PLAT_SAMSUNG_KEYPAD_H |
15 | 15 | ||
16 | #include <linux/input/matrix_keypad.h> | 16 | #include <linux/input/samsung-keypad.h> |
17 | |||
18 | #define SAMSUNG_MAX_ROWS 8 | ||
19 | #define SAMSUNG_MAX_COLS 8 | ||
20 | |||
21 | /** | ||
22 | * struct samsung_keypad_platdata - Platform device data for Samsung Keypad. | ||
23 | * @keymap_data: pointer to &matrix_keymap_data. | ||
24 | * @rows: number of keypad row supported. | ||
25 | * @cols: number of keypad col supported. | ||
26 | * @no_autorepeat: disable key autorepeat. | ||
27 | * @wakeup: controls whether the device should be set up as wakeup source. | ||
28 | * @cfg_gpio: configure the GPIO. | ||
29 | * | ||
30 | * Initialisation data specific to either the machine or the platform | ||
31 | * for the device driver to use or call-back when configuring gpio. | ||
32 | */ | ||
33 | struct samsung_keypad_platdata { | ||
34 | const struct matrix_keymap_data *keymap_data; | ||
35 | unsigned int rows; | ||
36 | unsigned int cols; | ||
37 | bool no_autorepeat; | ||
38 | bool wakeup; | ||
39 | |||
40 | void (*cfg_gpio)(unsigned int rows, unsigned int cols); | ||
41 | }; | ||
42 | 17 | ||
43 | /** | 18 | /** |
44 | * samsung_keypad_set_platdata - Set platform data for Samsung Keypad device. | 19 | * samsung_keypad_set_platdata - Set platform data for Samsung Keypad device. |