Input: pxa27x_keypad - enable rotary encoders and direct keys

[~andy/linux] / include / asm-arm / arch-pxa / pxa27x_keypad.h

diff --git a/include/asm-arm/arch-pxa/pxa27x_keypad.h b/include/asm-arm/arch-pxa/pxa27x_keypad.h
index ef17db6d791e9e86a6638efc4e922a73544e8eec..6b832329ebc27c167f595ddedc815f9b7d6f8a5f 100644 (file)
--- a/include/asm-arm/arch-pxa/pxa27x_keypad.h
+++ b/include/asm-arm/arch-pxa/pxa27x_keypad.h
@@ -1,12 +1,50 @@
-#define PXAKBD_MAXROW          8
-#define PXAKBD_MAXCOL          8
+#ifndef __ASM_ARCH_PXA27x_KEYPAD_H
+#define __ASM_ARCH_PXA27x_KEYPAD_H
 
+#include <linux/input.h>
+
+#define MAX_MATRIX_KEY_ROWS    (8)
+#define MAX_MATRIX_KEY_COLS    (8)
+
+/* pxa3xx keypad platform specific parameters
+ *
+ * NOTE:
+ * 1. direct_key_num indicates the number of keys in the direct keypad
+ *    _plus_ the number of rotary-encoder sensor inputs,  this can be
+ *    left as 0 if only rotary encoders are enabled,  the driver will
+ *    automatically calculate this
+ *
+ * 2. direct_key_map is the key code map for the direct keys, if rotary
+ *    encoder(s) are enabled, direct key 0/1(2/3) will be ignored
+ *
+ * 3. rotary can be either interpreted as a relative input event (e.g.
+ *    REL_WHEEL/REL_HWHEEL) or specific keys (e.g. UP/DOWN/LEFT/RIGHT)
+ */
 struct pxa27x_keypad_platform_data {
-       int nr_rows, nr_cols;
-       int keycodes[PXAKBD_MAXROW][PXAKBD_MAXCOL];
 
-#ifdef CONFIG_PM
-       u32 reg_kpc;
-       u32 reg_kprec;
-#endif
+       /* code map for the matrix keys */
+       unsigned int    matrix_key_rows;
+       unsigned int    matrix_key_cols;
+       unsigned int    *matrix_key_map;
+       int             matrix_key_map_size;
+
+       /* direct keys */
+       int             direct_key_num;
+       unsigned int    direct_key_map[8];
+
+       /* rotary encoders 0 */
+       int             enable_rotary0;
+       int             rotary0_rel_code;
+       int             rotary0_up_key;
+       int             rotary0_down_key;
+
+       /* rotary encoders 1 */
+       int             enable_rotary1;
+       int             rotary1_rel_code;
+       int             rotary1_up_key;
+       int             rotary1_down_key;
 };
+
+#define KEY(row, col, val)     (((row) << 28) | ((col) << 24) | (val))
+
+#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */