git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agp-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
pxa27x_keypad.h
diff --git
a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
index
d5a48a9
..
7b4eadc
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
+++ b/
arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
@@
-2,9
+2,12
@@
#define __ASM_ARCH_PXA27x_KEYPAD_H
#include <linux/input.h>
#define __ASM_ARCH_PXA27x_KEYPAD_H
#include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
#define MAX_MATRIX_KEY_ROWS (8)
#define MAX_MATRIX_KEY_COLS (8)
#define MAX_MATRIX_KEY_ROWS (8)
#define MAX_MATRIX_KEY_COLS (8)
+#define MATRIX_ROW_SHIFT (3)
+#define MAX_DIRECT_KEY_NUM (8)
/* pxa3xx keypad platform specific parameters
*
/* pxa3xx keypad platform specific parameters
*
@@
-33,7
+36,7
@@
struct pxa27x_keypad_platform_data {
/* direct keys */
int direct_key_num;
/* direct keys */
int direct_key_num;
- unsigned int direct_key_map[
8
];
+ unsigned int direct_key_map[
MAX_DIRECT_KEY_NUM
];
/* rotary encoders 0 */
int enable_rotary0;
/* rotary encoders 0 */
int enable_rotary0;
@@
-51,8
+54,6
@@
struct pxa27x_keypad_platform_data {
unsigned int debounce_interval;
};
unsigned int debounce_interval;
};
-#define KEY(row, col, val) (((row) << 28) | ((col) << 24) | (val))
-
extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);
#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */
extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);
#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */