Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 964de521 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: qt602240_ts - rename to atmel_mxt_ts 



Since the driver will be supporting whole range of Atmels mXT touchscreen
controllers we better rename it to atmel_mxt_ts.

Acked-by: default avatarIiro Valkonen <iiro.valkonen@atmel.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 2546bcc2

arch/arm/mach-s5pv210/mach-goni.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/fb.h>

#include <linux/i2c.h>

#include <linux/i2c-gpio.h>

#include <linux/i2c/qt602240_ts.h>

#include <linux/i2c/atmel_mxt_ts.h>

#include <linux/mfd/max8998.h>

#include <linux/mfd/wm8994/pdata.h>

#include <linux/regulator/fixed.h>

drivers/input/touchscreen/Kconfig

+12 −12
Original line number Diff line number Diff line
@@ -86,6 +86,18 @@ config TOUCHSCREEN_AD7879_SPI 
	  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
@@ -339,18 +351,6 @@ config TOUCHSCREEN_PENMOUNT 
	  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

drivers/input/touchscreen/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879) += ad7879.o 
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
@@ -37,7 +38,6 @@ obj-$(CONFIG_TOUCHSCREEN_HTCPEN) += htcpen.o 
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

drivers/input/touchscreen/qt602240_ts.c→drivers/input/touchscreen/atmel_mxt_ts.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/delay.h>

#include <linux/firmware.h>

#include <linux/i2c.h>

#include <linux/i2c/qt602240_ts.h>

#include <linux/i2c/atmel_mxt_ts.h>

#include <linux/input.h>

#include <linux/interrupt.h>

#include <linux/slab.h>