Merge branch 'tsc2005' into next

diff --combined drivers/input/touchscreen/Kconfig
index 2fbd3d3,30703ad..112ec55
--- 1/drivers/input/touchscreen/Kconfig
--- 2/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@@ -86,18 -86,6 +86,18 @@@ config TOUCHSCREEN_AD7879_SP
          To compile this driver as a module, choose M here: the
          module will be called ad7879-spi.
  
 +config TOUCHSCREEN_ATMEL_MXT
 +      tristate "Atmel mXT I2C Touchscreen"
 +      depends on I2C
 +      help
 +        Say Y here if you have Atmel mXT series I2C touchscreen,
 +        such as AT42QT602240/ATMXT224, connected to your system.
 +
 +        If unsure, say N.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called atmel_mxt_ts.
 +
  config TOUCHSCREEN_BITSY
        tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
        depends on SA1100_BITSY
@@@ -351,6 -339,18 +351,6 @@@ config TOUCHSCREEN_PENMOUN
          To compile this driver as a module, choose M here: the
          module will be called penmount.
  
 -config TOUCHSCREEN_QT602240
 -      tristate "QT602240 I2C Touchscreen"
 -      depends on I2C
 -      help
 -        Say Y here if you have the AT42QT602240/ATMXT224 I2C touchscreen
 -        connected to your system.
 -
 -        If unsure, say N.
 -
 -        To compile this driver as a module, choose M here: the
 -        module will be called qt602240_ts.
 -
  config TOUCHSCREEN_MIGOR
        tristate "Renesas MIGO-R touchscreen"
        depends on SH_MIGOR && I2C
@@@ -423,16 -423,6 +423,16 @@@ config TOUCHSCREEN_UCB140
          To compile this driver as a module, choose M here: the
          module will be called ucb1400_ts.
  
 +config TOUCHSCREEN_WM831X
 +      tristate "Support for WM831x touchscreen controllers"
 +      depends on MFD_WM831X
 +      help
 +        This enables support for the touchscreen controller on the WM831x
 +        series of PMICs.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called wm831x-ts.
 +
  config TOUCHSCREEN_WM97XX
        tristate "Support for WM97xx AC97 touchscreen controllers"
        depends on AC97_BUS
@@@ -550,62 -540,62 +550,62 @@@ config TOUCHSCREEN_MC1378
  
  config TOUCHSCREEN_USB_EGALAX
        default y
 -      bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
 +      bool "eGalax, eTurboTouch CT-410/510/700 device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_PANJIT
        default y
 -      bool "PanJit device support" if EMBEDDED
 +      bool "PanJit device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_3M
        default y
 -      bool "3M/Microtouch EX II series device support" if EMBEDDED
 +      bool "3M/Microtouch EX II series device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_ITM
        default y
 -      bool "ITM device support" if EMBEDDED
 +      bool "ITM device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_ETURBO
        default y
 -      bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
 +      bool "eTurboTouch (non-eGalax compatible) device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_GUNZE
        default y
 -      bool "Gunze AHL61 device support" if EMBEDDED
 +      bool "Gunze AHL61 device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_DMC_TSC10
        default y
 -      bool "DMC TSC-10/25 device support" if EMBEDDED
 +      bool "DMC TSC-10/25 device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_IRTOUCH
        default y
 -      bool "IRTOUCHSYSTEMS/UNITOP device support" if EMBEDDED
 +      bool "IRTOUCHSYSTEMS/UNITOP device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_IDEALTEK
        default y
 -      bool "IdealTEK URTC1000 device support" if EMBEDDED
 +      bool "IdealTEK URTC1000 device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_GENERAL_TOUCH
        default y
 -      bool "GeneralTouch Touchscreen device support" if EMBEDDED
 +      bool "GeneralTouch Touchscreen device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_GOTOP
        default y
 -      bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EMBEDDED
 +      bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_JASTEC
        default y
 -      bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EMBEDDED
 +      bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_E2I
@@@ -615,17 -605,17 +615,17 @@@
  
  config TOUCHSCREEN_USB_ZYTRONIC
        default y
 -      bool "Zytronic controller" if EMBEDDED
 +      bool "Zytronic controller" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_ETT_TC45USB
        default y
 -      bool "ET&T USB series TC4UM/TC5UH touchscreen controler support" if EMBEDDED
 +      bool "ET&T USB series TC4UM/TC5UH touchscreen controller support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_USB_NEXIO
        default y
 -      bool "NEXIO/iNexio device support" if EMBEDDED
 +      bool "NEXIO/iNexio device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
  
  config TOUCHSCREEN_TOUCHIT213
@@@ -639,6 -629,17 +639,17 @@@
          To compile this driver as a module, choose M here: the
          module will be called touchit213.
  
+ config TOUCHSCREEN_TSC2005
+         tristate "TSC2005 based touchscreens"
+         depends on SPI_MASTER
+         help
+           Say Y here if you have a TSC2005 based touchscreen.
+ 
+         If unsure, say N.
+ 
+         To compile this driver as a module, choose M here: the
+         module will be called tsc2005.
+ 
  config TOUCHSCREEN_TSC2007
        tristate "TSC2007 based touchscreens"
        depends on I2C
@@@ -669,17 -670,17 +680,17 @@@ config TOUCHSCREEN_PCA
          To compile this driver as a module, choose M here: the
          module will be called pcap_ts.
  
 -config TOUCHSCREEN_TPS6507X
 -      tristate "TPS6507x based touchscreens"
 +config TOUCHSCREEN_ST1232
 +      tristate "Sitronix ST1232 touchscreen controllers"
        depends on I2C
        help
 -        Say Y here if you have a TPS6507x based touchscreen
 -        controller.
 +        Say Y here if you want to support Sitronix ST1232
 +        touchscreen controller.
  
          If unsure, say N.
  
          To compile this driver as a module, choose M here: the
 -        module will be called tps6507x_ts.
 +        module will be called st1232_ts.
  
  config TOUCHSCREEN_STMPE
        tristate "STMicroelectronics STMPE touchscreens"
@@@ -691,16 -692,4 +702,16 @@@
          To compile this driver as a module, choose M here: the
          module will be called stmpe-ts.
  
 +config TOUCHSCREEN_TPS6507X
 +      tristate "TPS6507x based touchscreens"
 +      depends on I2C
 +      help
 +        Say Y here if you have a TPS6507x based touchscreen
 +        controller.
 +
 +        If unsure, say N.
 +
 +        To compile this driver as a module, choose M here: the
 +        module will be called tps6507x_ts.
 +
  endif

diff --combined drivers/input/touchscreen/Makefile
index 7561564,34b26ad..ca94098
--- 1/drivers/input/touchscreen/Makefile
--- 2/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@@ -12,7 -12,6 +12,7 @@@ obj-$(CONFIG_TOUCHSCREEN_AD7879)      += ad7
  obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C)  += ad7879-i2c.o
  obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI)  += ad7879-spi.o
  obj-$(CONFIG_TOUCHSCREEN_ADS7846)     += ads7846.o
 +obj-$(CONFIG_TOUCHSCREEN_ATMEL_MXT)   += atmel_mxt_ts.o
  obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC)        += atmel_tsadcc.o
  obj-$(CONFIG_TOUCHSCREEN_BITSY)               += h3600_ts_input.o
  obj-$(CONFIG_TOUCHSCREEN_BU21013)       += bu21013_ts.o
@@@ -38,17 -37,17 +38,18 @@@ obj-$(CONFIG_TOUCHSCREEN_HTCPEN)   += htc
  obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE)       += usbtouchscreen.o
  obj-$(CONFIG_TOUCHSCREEN_PCAP)                += pcap_ts.o
  obj-$(CONFIG_TOUCHSCREEN_PENMOUNT)    += penmount.o
 -obj-$(CONFIG_TOUCHSCREEN_QT602240)    += qt602240_ts.o
  obj-$(CONFIG_TOUCHSCREEN_S3C2410)     += s3c2410_ts.o
 +obj-$(CONFIG_TOUCHSCREEN_ST1232)      += st1232.o
  obj-$(CONFIG_TOUCHSCREEN_STMPE)               += stmpe-ts.o
  obj-$(CONFIG_TOUCHSCREEN_TNETV107X)   += tnetv107x-ts.o
  obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213)  += touchit213.o
  obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)  += touchright.o
  obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)    += touchwin.o
+ obj-$(CONFIG_TOUCHSCREEN_TSC2005)     += tsc2005.o
  obj-$(CONFIG_TOUCHSCREEN_TSC2007)     += tsc2007.o
  obj-$(CONFIG_TOUCHSCREEN_UCB1400)     += ucb1400_ts.o
  obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
 +obj-$(CONFIG_TOUCHSCREEN_WM831X)      += wm831x-ts.o
  obj-$(CONFIG_TOUCHSCREEN_WM97XX)      += wm97xx-ts.o
  wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705)        += wm9705.o
  wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712)        += wm9712.o