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

Pull input updates from Dmitry Torokhov:
 "A big update to the Atmel touchscreen driver, devm support for polled
  input devices, several drivers have been converted to using managed
  resources, and assorted driver fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (87 commits)
  Input: synaptics - fix resolution for manually provided min/max
  Input: atmel_mxt_ts - fix invalid return from mxt_get_bootloader_version
  Input: max8997_haptic - add error handling for regulator and pwm
  Input: elantech - don't set bit 1 of reg_10 when the no_hw_res quirk is set
  Input: elantech - deal with clickpads reporting right button events
  Input: edt-ft5x06 - fix an i2c write for M09 support
  Input: omap-keypad - remove platform data support
  ARM: OMAP2+: remove unused omap4-keypad file and code
  Input: ab8500-ponkey - switch to using managed resources
  Input: max8925_onkey - switch to using managed resources
  Input: 88pm860x-ts - switch to using managed resources
  Input: 88pm860x_onkey - switch to using managed resources
  Input: intel-mid-touch - switch to using managed resources
  Input: wacom - process outbound for newer Cintiqs
  Input: wacom - set stylus_in_proximity when pen is in range
  DTS: ARM: OMAP3-N900: Add tsc2005 support
  Input: tsc2005 - add DT support
  Input: add common DT binding for touchscreens
  Input: jornada680_kbd - switch top using managed resources
  Input: adp5520-keys - switch to using managed resources
  ...

1 files changed, 11 insertions, 22 deletions

diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
index 7f3aad0e115c..7f1a2e2711bd 100644
--- a/drivers/platform/chrome/chromeos_laptop.c
+++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -84,21 +84,19 @@ static struct i2c_board_info tsl2563_als_device = {
         I2C_BOARD_INFO("tsl2563", TAOS_ALS_I2C_ADDR),
 };
 
+static int mxt_t19_keys[] = {
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        KEY_RESERVED,
+        BTN_LEFT
+};
+
 static struct mxt_platform_data atmel_224s_tp_platform_data = {
-        .x_line                 = 18,
-        .y_line                 = 12,
-        .x_size                 = 102*20,
-        .y_size                 = 68*20,
-        .blen                   = 0x80, /* Gain setting is in upper 4 bits */
-        .threshold              = 0x32,
-        .voltage                = 0,    /* 3.3V */
-        .orient                 = MXT_VERTICAL_FLIP,
         .irqflags               = IRQF_TRIGGER_FALLING,
-        .is_tp                  = true,
-        .key_map                = { KEY_RESERVED,
-                                    KEY_RESERVED,
-                                    KEY_RESERVED,
-                                    BTN_LEFT },
+        .t19_num_keys           = ARRAY_SIZE(mxt_t19_keys),
+        .t19_keymap             = mxt_t19_keys,
         .config                 = NULL,
         .config_length          = 0,
 };
@@ -110,16 +108,7 @@ static struct i2c_board_info atmel_224s_tp_device = {
 };
 
 static struct mxt_platform_data atmel_1664s_platform_data = {
-        .x_line                 = 32,
-        .y_line                 = 50,
-        .x_size                 = 1700,
-        .y_size                 = 2560,
-        .blen                   = 0x89, /* Gain setting is in upper 4 bits */
-        .threshold              = 0x28,
-        .voltage                = 0,    /* 3.3V */
-        .orient                 = MXT_ROTATED_90_COUNTER,
         .irqflags               = IRQF_TRIGGER_FALLING,
-        .is_tp                  = false,
         .config                 = NULL,
         .config_length          = 0,
 };