linux_old1/drivers/input/touchscreen
Linus Torvalds 30304e5a79 MFD changes for 3.4
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJPcXgCAAoJEIqAPN1PVmxKh2oP/2Ns+dr4oOF8z+uqYG1oisJd
 CxBTC1Bi9gYBtpiMztPiHZWiQtVXoDgLbLkx6ooWH5dpwCdvU6TVBZUJp4wpELtx
 mMk5vJy4/INHgI0nk5wUOr76rNlQfIcK04f+LHBSG1iljUkoVR3FefVKgoyIP+Wv
 oiCeuCyQcYIUmG1pVt1x43OoS+2xgjWQA67AalLLRj1DOA5OkvUL7NGsrZ1iZTUh
 YHQJsK6ER3MgbFFEImtn10NNFwAEG04o6vi42DFW1O0awm6kmVoLjo46wS+UiKoh
 Vx8t5ZGvlYOZ1ZM9N5ETgQnihBt7cOhA3ivZar8h+WiYVTRJs1ZSkpmnlpmM4YY9
 RCZ5DRw3N39R0ezkNVGSr1Xn1vkysIiZI82frrJiPUYLKihsrBzj2Jq3O25iILCf
 Iyv7HBEJxAb3x0zlF6kPhaA8OW4dssaHTLNx5IJSOKwiwVLdm4RPyOHh9QVz++p/
 p0hvSQWK1MUruBbBrjF/FN+FidgK2iU0iDW/GoDwI7OKymSxg7sauLtp0cZpo6nT
 F+Ep6yl/uR5vxih4LSYFJOjoeKuwIo/x92H0qJ3UroaUs9DNJ7UCKchXXiQ1Wtnz
 tAAsWP1YsMxMzlMxqW5J9w4LJynJ8bqrC0L8+HWzIUwikA8wv8/47Pmc/vPW0Y3N
 5L7KMS8/iFCsS8rPmGeP
 =onDl
 -----END PGP SIGNATURE-----

Merge tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

Pull MFD changes from Samuel Ortiz:
 - 4 new drivers: Freescale i.MX on-chip Anatop, Ricoh's RC5T583 and
   TI's TPS65090 and TPS65217.
 - New variants support (8420, 8520 ab9540), cleanups and bug fixes for
   the abx500 and db8500 ST-E chipsets.
 - Some minor fixes and update for the wm8994 from Mark.
 - The beginning of a long term TWL cleanup effort coming from the TI
   folks.
 - Various fixes and cleanups for the s5m, TPS659xx, pm860x, and MAX8997
   drivers.

Fix up trivial conflicts due to duplicate patches and header file
cleanups (<linux/device.h> removal etc).

* tag 'mfd_3.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (97 commits)
  gpio/twl: Add DT support to gpio-twl4030 driver
  gpio/twl: Allocate irq_desc dynamically for SPARSE_IRQ support
  mfd: Detach twl6040 from the pmic mfd driver
  mfd: Replace twl-* pr_ macros by the dev_ equivalent and do various cleanups
  mfd: Micro-optimization on twl4030 IRQ handler
  mfd: Make twl4030 SIH SPARSE_IRQ capable
  mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files
  mfd: Remove references already defineid in header file from twl-core
  mfd: Remove unneeded header from twl-core
  mfd: Make twl-core not depend on pdata->irq_base/end
  ARM: OMAP2+: board-omap4-*: Do not use anymore TWL6030_IRQ_BASE in board files
  mfd: Return twl6030_mmc_card_detect IRQ for board setup
  Revert "mfd: Add platform data for MAX8997 haptic driver"
  mfd: Add support for TPS65090
  mfd: Add some da9052-i2c section annotations
  mfd: Build rtc5t583 only if I2C config is selected to y.
  mfd: Add anatop mfd driver
  mfd: Fix compilation error in tps65910.h
  mfd: Add 8420 variant to db8500-prcmu
  mfd: Add 8520 PRCMU variant to db8500-prcmu
  ...
2012-03-28 13:56:35 -07:00
..
88pm860x-ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
Kconfig ARM: global cleanups 2012-03-27 16:03:32 -07:00
Makefile Input: ili210x - add support for Ilitek ILI210x based touchscreens 2012-03-17 12:20:44 -07:00
ad7877.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
ad7879-i2c.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
ad7879-spi.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
ad7879.c Merge commit 'v3.2-rc3' into next 2011-11-29 01:51:07 -08:00
ad7879.h Input: ad7879 - consolidate PM methods 2011-11-15 22:24:22 -08:00
ads7846.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
atmel-wm97xx.c Merge commit 'v3.3-rc6' into next 2012-03-09 10:55:17 -08:00
atmel_mxt_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
atmel_tsadcc.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
auo-pixcir-ts.c Input: synaptics_usb - switch to module_usb_driver() 2012-03-16 23:06:34 -07:00
bu21013_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
cy8ctmg110_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
cyttsp_core.c Input: cyttsp - remove useless checks in cyttsp_probe() 2012-03-04 10:49:27 -08:00
cyttsp_core.h Input: add Cypress TTSP capacitive multi-touch screen support 2012-01-31 00:18:36 -08:00
cyttsp_i2c.c Input: synaptics_usb - switch to module_usb_driver() 2012-03-16 23:06:34 -07:00
cyttsp_spi.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
da9034-ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
dynapro.c Input: add driver for Dynapro serial touchscreen 2009-10-26 11:01:30 -07:00
eeti_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
egalax_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
elo.c Input: elo - switch to using dev_xxx() when printing messages 2010-01-06 23:54:40 -08:00
fujitsu_ts.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
gunze.c Input: remove CVS keywords 2008-05-20 12:17:39 -04:00
h3600_ts_input.c Input: remove IRQF_DISABLED from drivers 2011-09-07 14:19:11 -07:00
hampshire.c Input: add driver for hampshire serial touchscreens 2010-04-13 23:27:41 -07:00
hp680_ts_input.c Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible 2012-03-12 22:17:56 -07:00
htcpen.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
ili210x.c Input: ili210x - add support for Ilitek ILI210x based touchscreens 2012-03-17 12:20:44 -07:00
inexio.c Input: Add driver for iNexio serial touchscreen. 2008-06-30 09:37:32 -04:00
intel-mid-touch.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
jornada720_ts.c ARM: 7341/1: input: prepare jornada720 keyboard and ts for sa11x0 sparse irq 2012-03-25 23:57:19 +01:00
lpc32xx_ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
mainstone-wm97xx.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
max11801_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
mc13783_ts.c mfd: Add pdata to set mc13783-ts conversion delay 2012-03-06 18:46:30 +01:00
mcs5000_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
migor_ts.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
mk712.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
mtouch.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
pcap_ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
penmount.c Input: penmount - simplify unregister procedure 2011-09-20 22:46:31 -07:00
pixcir_i2c_ts.c Input: synaptics_usb - switch to module_usb_driver() 2012-03-16 23:06:34 -07:00
s3c2410_ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
st1232.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
stmpe-ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
ti_tscadc.c Input: add support for TI Touchscreen controller 2012-03-04 08:45:00 -08:00
tnetv107x-ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
touchit213.c Input: add driver for Tabletkiosk Sahara TouchIT-213 touchscreen 2008-07-07 12:00:30 -04:00
touchright.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
touchwin.c get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
tps6507x-ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
tsc40.c Input: add a driver for TSC-40 serial touchscreen 2011-09-28 10:24:14 -07:00
tsc2005.c Input: convert SPI drivers to use module_spi_driver() 2012-03-16 23:06:11 -07:00
tsc2007.c Input: convert I2C drivers to use module_i2c_driver() 2012-03-16 23:06:19 -07:00
ucb1400_ts.c module_param: make bool parameters really bool (drivers & misc) 2012-01-13 09:32:20 +10:30
usbtouchscreen.c Merge commit 'v3.3-rc6' into next 2012-03-09 10:55:17 -08:00
w90p910_ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
wacom_w8001.c Merge branch 'next' into for-linus 2011-10-26 21:46:20 -07:00
wm97xx-core.c Fix common misspellings 2011-03-31 11:26:23 -03:00
wm831x-ts.c Input: touchscreen - use macro module_platform_driver() 2011-11-30 23:41:43 -08:00
wm9705.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
wm9712.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
wm9713.c Input: wm97xx - mark channels which need pen_down 2011-07-04 19:31:47 -07:00
zylonite-wm97xx.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2012-01-10 10:55:52 -08:00