1
0
Fork 0
alistair23-linux/include/linux/i2c
Linus Torvalds 2c01e7bc46 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
  ...
2012-05-24 10:34:29 -07:00
..
adp5588.h Input: adp5588 - add support for gpio names 2012-05-10 22:34:16 -07:00
adp8860.h backlight: adp8860: add support for ADP8861 & ADP8863 2010-05-26 13:08:33 +01:00
adp8870.h backlight: new driver for the ADP8870 backlight devices 2011-06-15 20:03:59 -07:00
ads1015.h hwmon: (ads1015) Make gain and datarate configurable 2011-03-21 17:59:37 +01:00
apds990x.h drivers/misc: driver for APDS990X ALS and proximity sensors 2010-10-26 16:52:14 -07:00
at24.h misc: at24: describe platform_data with kernel_doc 2012-02-24 22:25:58 +01:00
atmel_mxt_ts.h Input: atmel_mxt_ts - allow board code to specify IRQ flags 2011-02-21 01:02:34 -08:00
bh1770glc.h drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor 2010-10-26 16:52:14 -07:00
dm355evm_msp.h
ds620.h hwmon: Support for Dallas Semiconductor DS620 2011-01-09 09:10:10 -08:00
i2c-sh_mobile.h i2c: i2c-sh_mobile bus speed platform data V2 2011-05-11 07:08:13 +01:00
lm8323.h
ltc4245.h hwmon: (ltc4245) Expose all GPIO pins as analog voltages 2010-08-14 21:08:49 +02:00
max732x.h gpio: add interrupt handling capability to max732x 2010-05-27 09:12:41 -07:00
max6639.h hwmon: Driver for Maxim MAX6639 2011-03-14 22:36:24 -07:00
mcs.h Input: mcs_touchkey - add support for suspend/resume 2011-02-23 21:43:31 -08:00
mpr121_touchkey.h Input: add driver FSL MPR121 capacitive touch sensor 2011-05-12 08:28:58 -07:00
pca953x.h gpiolib: make names array and its values const 2010-05-27 09:12:41 -07:00
pca954x.h i2c: I2C bus multiplexer driver pca954x 2010-08-11 18:21:03 +02:00
pcf857x.h
pmbus.h hwmon: PMBus device driver 2011-03-14 22:36:26 -07:00
pxa-i2c.h ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
s6000.h
sx150x.h gpio: sx150x: correct and refine reset-on-probe behavior 2010-09-09 18:57:24 -07:00
tc35876x.h gma500: initial medfield merge 2012-03-10 13:05:48 +00:00
tps65010.h mfd: Allow configuration of VDCDC2 for tps65010 2009-12-13 19:21:36 +01:00
tsc2007.h Input: tsc2007 - make sure that X plate resistance is specified 2011-10-11 20:56:41 -07:00
twl.h Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next 2012-05-12 11:10:25 +01:00
twl4030-madc.h mfd: Turn on the twl4030-madc MADC clock 2011-10-24 14:09:10 +02:00