• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 2c01e7bc
    Linus Torvalds authored
    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
      ...
    2c01e7bc
sysfs-driver-wacom 3.34 KB