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: (58 commits)
  Input: wacom_w8001 - support pen or touch only devices
  Input: wacom_w8001 - use __set_bit to set keybits
  Input: bu21013_ts - fix misuse of logical operation in place of bitop
  Input: i8042 - add Acer Aspire 5100 to the Dritek list
  Input: wacom - add support for digitizer in Lenovo W700
  Input: psmouse - disable the synaptics extension on OLPC machines
  Input: psmouse - fix up Synaptics comment
  Input: synaptics - ignore bogus mt packet
  Input: synaptics - add multi-finger and semi-mt support
  Input: synaptics - report clickpad property
  input: mt: Document interface updates
  Input: fix double equality sign in uevent
  Input: introduce device properties
  hid: egalax: Add support for Wetab (726b)
  Input: include MT library as source for kerneldoc
  MAINTAINERS: Update input-mt entry
  hid: egalax: Add support for Samsung NB30 netbook
  hid: egalax: Document the new devices in Kconfig
  hid: egalax: Add support for Wetab
  hid: egalax: Convert to MT slots
  ...

Fixed up trivial conflict in drivers/input/keyboard/Kconfig

1 files changed, 141 insertions, 0 deletions

diff --git a/arch/arm/plat-spear/include/plat/keyboard.h b/arch/arm/plat-spear/include/plat/keyboard.h
new file mode 100644
index 00000000000..68b5394fc58
--- /dev/null
+++ b/arch/arm/plat-spear/include/plat/keyboard.h
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2010 ST Microelectronics
+ * Rajeev Kumar<rajeev-dlh.kumar@st.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2. This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __PLAT_KEYBOARD_H
+#define __PLAT_KEYBOARD_H
+
+#include <linux/bitops.h>
+#include <linux/input.h>
+#include <linux/input/matrix_keypad.h>
+#include <linux/types.h>
+
+#define DECLARE_KEYMAP(_name) \
+int _name[] = { \
+        KEY(0, 0, KEY_ESC), \
+        KEY(0, 1, KEY_1), \
+        KEY(0, 2, KEY_2), \
+        KEY(0, 3, KEY_3), \
+        KEY(0, 4, KEY_4), \
+        KEY(0, 5, KEY_5), \
+        KEY(0, 6, KEY_6), \
+        KEY(0, 7, KEY_7), \
+        KEY(0, 8, KEY_8), \
+        KEY(1, 0, KEY_9), \
+        KEY(1, 1, KEY_MINUS), \
+        KEY(1, 2, KEY_EQUAL), \
+        KEY(1, 3, KEY_BACKSPACE), \
+        KEY(1, 4, KEY_TAB), \
+        KEY(1, 5, KEY_Q), \
+        KEY(1, 6, KEY_W), \
+        KEY(1, 7, KEY_E), \
+        KEY(1, 8, KEY_R), \
+        KEY(2, 0, KEY_T), \
+        KEY(2, 1, KEY_Y), \
+        KEY(2, 2, KEY_U), \
+        KEY(2, 3, KEY_I), \
+        KEY(2, 4, KEY_O), \
+        KEY(2, 5, KEY_P), \
+        KEY(2, 6, KEY_LEFTBRACE), \
+        KEY(2, 7, KEY_RIGHTBRACE), \
+        KEY(2, 8, KEY_ENTER), \
+        KEY(3, 0, KEY_LEFTCTRL), \
+        KEY(3, 1, KEY_A), \
+        KEY(3, 2, KEY_S), \
+        KEY(3, 3, KEY_D), \
+        KEY(3, 4, KEY_F), \
+        KEY(3, 5, KEY_G), \
+        KEY(3, 6, KEY_H), \
+        KEY(3, 7, KEY_J), \
+        KEY(3, 8, KEY_K), \
+        KEY(4, 0, KEY_L), \
+        KEY(4, 1, KEY_SEMICOLON), \
+        KEY(4, 2, KEY_APOSTROPHE), \
+        KEY(4, 3, KEY_GRAVE), \
+        KEY(4, 4, KEY_LEFTSHIFT), \
+        KEY(4, 5, KEY_BACKSLASH), \
+        KEY(4, 6, KEY_Z), \
+        KEY(4, 7, KEY_X), \
+        KEY(4, 8, KEY_C), \
+        KEY(4, 0, KEY_L), \
+        KEY(4, 1, KEY_SEMICOLON), \
+        KEY(4, 2, KEY_APOSTROPHE), \
+        KEY(4, 3, KEY_GRAVE), \
+        KEY(4, 4, KEY_LEFTSHIFT), \
+        KEY(4, 5, KEY_BACKSLASH), \
+        KEY(4, 6, KEY_Z), \
+        KEY(4, 7, KEY_X), \
+        KEY(4, 8, KEY_C), \
+        KEY(4, 0, KEY_L), \
+        KEY(4, 1, KEY_SEMICOLON), \
+        KEY(4, 2, KEY_APOSTROPHE), \
+        KEY(4, 3, KEY_GRAVE), \
+        KEY(4, 4, KEY_LEFTSHIFT), \
+        KEY(4, 5, KEY_BACKSLASH), \
+        KEY(4, 6, KEY_Z), \
+        KEY(4, 7, KEY_X), \
+        KEY(4, 8, KEY_C), \
+        KEY(5, 0, KEY_V), \
+        KEY(5, 1, KEY_B), \
+        KEY(5, 2, KEY_N), \
+        KEY(5, 3, KEY_M), \
+        KEY(5, 4, KEY_COMMA), \
+        KEY(5, 5, KEY_DOT), \
+        KEY(5, 6, KEY_SLASH), \
+        KEY(5, 7, KEY_RIGHTSHIFT), \
+        KEY(5, 8, KEY_KPASTERISK), \
+        KEY(6, 0, KEY_LEFTALT), \
+        KEY(6, 1, KEY_SPACE), \
+        KEY(6, 2, KEY_CAPSLOCK), \
+        KEY(6, 3, KEY_F1), \
+        KEY(6, 4, KEY_F2), \
+        KEY(6, 5, KEY_F3), \
+        KEY(6, 6, KEY_F4), \
+        KEY(6, 7, KEY_F5), \
+        KEY(6, 8, KEY_F6), \
+        KEY(7, 0, KEY_F7), \
+        KEY(7, 1, KEY_F8), \
+        KEY(7, 2, KEY_F9), \
+        KEY(7, 3, KEY_F10), \
+        KEY(7, 4, KEY_NUMLOCK), \
+        KEY(7, 5, KEY_SCROLLLOCK), \
+        KEY(7, 6, KEY_KP7), \
+        KEY(7, 7, KEY_KP8), \
+        KEY(7, 8, KEY_KP9), \
+        KEY(8, 0, KEY_KPMINUS), \
+        KEY(8, 1, KEY_KP4), \
+        KEY(8, 2, KEY_KP5), \
+        KEY(8, 3, KEY_KP6), \
+        KEY(8, 4, KEY_KPPLUS), \
+        KEY(8, 5, KEY_KP1), \
+        KEY(8, 6, KEY_KP2), \
+        KEY(8, 7, KEY_KP3), \
+        KEY(8, 8, KEY_KP0), \
+}
+
+/**
+ * struct kbd_platform_data - spear keyboard platform data
+ * keymap: pointer to keymap data (table and size)
+ * rep: enables key autorepeat
+ *
+ * This structure is supposed to be used by platform code to supply
+ * keymaps to drivers that implement keyboards.
+ */
+struct kbd_platform_data {
+        const struct matrix_keymap_data *keymap;
+        bool rep;
+};
+
+/* This function is used to set platform data field of pdev->dev */
+static inline void
+kbd_set_plat_data(struct platform_device *pdev, struct kbd_platform_data *data)
+{
+        pdev->dev.platform_data = data;
+}
+
+#endif /* __PLAT_KEYBOARD_H */