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

Pull input layer updates from Dmitry Torokhov:
 - a bunch of new drivers (DA9052/53 touchscreenn controller, Synaptics
   Navpoint, LM8333 keypads, Wacom I2C touhscreen);
 - updates to existing touchpad drivers (ALPS, Sntelic);
 - Wacom driver now supports Intuos5;
 - device-tree bindings in numerous drivers;
 - other cleanups and fixes.

Fix annoying conflict in drivers/input/tablet/wacom_wac.c that I think
implies that the input layer device naming is broken, but let's see.  I
brough it up with Dmitry.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (57 commits)
  Input: matrix-keymap - fix building keymaps
  Input: spear-keyboard - document DT bindings
  Input: spear-keyboard - add device tree bindings
  Input: matrix-keymap - wire up device tree support
  Input: matrix-keymap - uninline and prepare for device tree support
  Input: adp5588 - add support for gpio names
  Input: omap-keypad - dynamically handle register offsets
  Input: synaptics - fix compile warning
  MAINTAINERS: adjust input-related patterns
  Input: ALPS - switch to using input_mt_report_finger_count
  Input: ALPS - add semi-MT support for v4 protocol
  Input: Add Synaptics NavPoint (PXA27x SSP/SPI) driver
  Input: atmel_mxt_ts - dump each message on just 1 line
  Input: atmel_mxt_ts - do not read extra (checksum) byte
  Input: atmel_mxt_ts - verify object size in mxt_write_object
  Input: atmel_mxt_ts - only allow root to update firmware
  Input: atmel_mxt_ts - use CONFIG_PM_SLEEP
  Input: sentelic - report device's production serial number
  Input: tl6040-vibra - Device Tree support
  Input: evdev - properly handle read/write with count 0
  ...

1 files changed, 18 insertions, 23 deletions

diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tc3589x-keypad.c
index 2dee3e4e7c6f..7d498e698508 100644
--- a/drivers/input/keyboard/tc3589x-keypad.c
+++ b/drivers/input/keyboard/tc3589x-keypad.c
@@ -78,7 +78,7 @@
  * @input:      pointer to input device object
  * @board:      keypad platform device
  * @krow:       number of rows
- * @kcol:       number of coloumns
+ * @kcol:       number of columns
  * @keymap:     matrix scan code table for keycodes
  * @keypad_stopped: holds keypad status
  */
@@ -96,21 +96,15 @@ static int tc3589x_keypad_init_key_hardware(struct tc_keypad *keypad)
 {
         int ret;
         struct tc3589x *tc3589x = keypad->tc3589x;
-        u8 settle_time = keypad->board->settle_time;
-        u8 dbounce_period = keypad->board->debounce_period;
-        u8 rows = keypad->board->krow & 0xf;    /* mask out the nibble */
-        u8 column = keypad->board->kcol & 0xf;  /* mask out the nibble */
-
-        /* validate platform configurations */
-        if (keypad->board->kcol > TC3589x_MAX_KPCOL ||
-            keypad->board->krow > TC3589x_MAX_KPROW ||
-            keypad->board->debounce_period > TC3589x_MAX_DEBOUNCE_SETTLE ||
-            keypad->board->settle_time > TC3589x_MAX_DEBOUNCE_SETTLE)
+        const struct tc3589x_keypad_platform_data *board = keypad->board;
+
+        /* validate platform configuration */
+        if (board->kcol > TC3589x_MAX_KPCOL || board->krow > TC3589x_MAX_KPROW)
                 return -EINVAL;
 
         /* configure KBDSIZE 4 LSbits for cols and 4 MSbits for rows */
         ret = tc3589x_reg_write(tc3589x, TC3589x_KBDSIZE,
-                        (rows << KP_ROW_SHIFT) | column);
+                        (board->krow << KP_ROW_SHIFT) | board->kcol);
         if (ret < 0)
                 return ret;
 
@@ -124,12 +118,14 @@ static int tc3589x_keypad_init_key_hardware(struct tc_keypad *keypad)
                 return ret;
 
         /* Configure settle time */
-        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDSETTLE_REG, settle_time);
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDSETTLE_REG,
+                                board->settle_time);
         if (ret < 0)
                 return ret;
 
         /* Configure debounce time */
-        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDBOUNCE, dbounce_period);
+        ret = tc3589x_reg_write(tc3589x, TC3589x_KBDBOUNCE,
+                                board->debounce_period);
         if (ret < 0)
                 return ret;
 
@@ -337,23 +333,22 @@ static int __devinit tc3589x_keypad_probe(struct platform_device *pdev)
         input->name = pdev->name;
         input->dev.parent = &pdev->dev;
 
-        input->keycode = keypad->keymap;
-        input->keycodesize = sizeof(keypad->keymap[0]);
-        input->keycodemax = ARRAY_SIZE(keypad->keymap);
-
         input->open = tc3589x_keypad_open;
         input->close = tc3589x_keypad_close;
 
-        input_set_drvdata(input, keypad);
+        error = matrix_keypad_build_keymap(plat->keymap_data, NULL,
+                                           TC3589x_MAX_KPROW, TC3589x_MAX_KPCOL,
+                                           keypad->keymap, input);
+        if (error) {
+                dev_err(&pdev->dev, "Failed to build keymap\n");
+                goto err_free_mem;
+        }
 
         input_set_capability(input, EV_MSC, MSC_SCAN);
-
-        __set_bit(EV_KEY, input->evbit);
         if (!plat->no_autorepeat)
                 __set_bit(EV_REP, input->evbit);
 
-        matrix_keypad_build_keymap(plat->keymap_data, 0x3,
-                        input->keycode, input->keybit);
+        input_set_drvdata(input, keypad);
 
         error = request_threaded_irq(irq, NULL,
                         tc3589x_keypad_irq, plat->irqtype,