Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (52 commits)
  Input: bcm5974 - silence uninitialized variables warnings
  Input: wistron_btns - add keymap for AOpen 1557
  Input: psmouse - use boolean type
  Input: i8042 - use platform_driver_probe
  Input: i8042 - use boolean type where it makes sense
  Input: i8042 - try disabling and re-enabling AUX port at close
  Input: pxa27x_keypad - allow modifying keymap from userspace
  Input: sunkbd - fix formatting
  Input: i8042 - bypass AUX IRQ delivery test on laptops
  Input: wacom_w8001 - simplify querying logic
  Input: atkbd - allow setting force-release bitmap via sysfs
  Input: w90p910_keypad - move a dereference below a NULL test
  Input: add twl4030_keypad driver
  Input: matrix-keypad - add function to build device keymap
  Input: tosakbd - fix cleaning up KEY_STROBEs after error
  Input: joydev - validate axis/button maps before clobbering current ones
  Input: xpad - add USB ID for the drumkit controller from Rock Band
  Input: w90p910_keypad - rename driver name to match platform
  Input: add new driver for Sentelic Finger Sensing Pad
  Input: psmouse - allow defining read-only attributes
  ...

3 files changed, 58 insertions, 3 deletions

diff --git a/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h b/arch/arm/mach-pxa/include/mach/pxa27x_keypad.h
index d5a48a96dea7..7b4eadc6df3a 100644
--- 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>
+#include <linux/input/matrix_keypad.h>
 
 #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
  *
@@ -33,7 +36,7 @@ struct pxa27x_keypad_platform_data {
 
         /* 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;
@@ -51,8 +54,6 @@ struct pxa27x_keypad_platform_data {
         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 */
diff --git a/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h b/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
new file mode 100644
index 000000000000..556778e8ddaa
--- /dev/null
+++ b/arch/arm/mach-w90x900/include/mach/w90p910_keypad.h
@@ -0,0 +1,15 @@
+#ifndef __ASM_ARCH_W90P910_KEYPAD_H
+#define __ASM_ARCH_W90P910_KEYPAD_H
+
+#include <linux/input/matrix_keypad.h>
+
+extern void mfp_set_groupi(struct device *dev);
+
+struct w90p910_keypad_platform_data {
+        const struct matrix_keymap_data *keymap_data;
+
+        unsigned int    prescale;
+        unsigned int    debounce;
+};
+
+#endif /* __ASM_ARCH_W90P910_KEYPAD_H */
diff --git a/arch/blackfin/include/asm/bfin_rotary.h b/arch/blackfin/include/asm/bfin_rotary.h
new file mode 100644
index 000000000000..425ece64fd5e
--- /dev/null
+++ b/arch/blackfin/include/asm/bfin_rotary.h
@@ -0,0 +1,39 @@
+/*
+ * board initialization should put one of these structures into platform_data
+ * and place the bfin-rotary onto platform_bus named "bfin-rotary".
+ */
+
+#ifndef _BFIN_ROTARY_H
+#define _BFIN_ROTARY_H
+
+/* mode bitmasks */
+#define ROT_QUAD_ENC    CNTMODE_QUADENC /* quadrature/grey code encoder mode */
+#define ROT_BIN_ENC     CNTMODE_BINENC  /* binary encoder mode */
+#define ROT_UD_CNT      CNTMODE_UDCNT   /* rotary counter mode */
+#define ROT_DIR_CNT     CNTMODE_DIRCNT  /* direction counter mode */
+
+#define ROT_DEBE        DEBE            /* Debounce Enable */
+
+#define ROT_CDGINV      CDGINV          /* CDG Pin Polarity Invert */
+#define ROT_CUDINV      CUDINV          /* CUD Pin Polarity Invert */
+#define ROT_CZMINV      CZMINV          /* CZM Pin Polarity Invert */
+
+struct bfin_rotary_platform_data {
+        /* set rotary UP KEY_### or BTN_### in case you prefer
+         * bfin-rotary to send EV_KEY otherwise set 0
+         */
+        unsigned int rotary_up_key;
+        /* set rotary DOWN KEY_### or BTN_### in case you prefer
+         * bfin-rotary to send EV_KEY otherwise set 0
+         */
+        unsigned int rotary_down_key;
+        /* set rotary BUTTON KEY_### or BTN_### */
+        unsigned int rotary_button_key;
+        /* set rotary Relative Axis REL_### in case you prefer
+         * bfin-rotary to send EV_REL otherwise set 0
+         */
+        unsigned int rotary_rel_code;
+        unsigned short debounce;        /* 0..17 */
+        unsigned short mode;
+};
+#endif