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

Commit 6ac24381 authored by Michael Welling's avatar Michael Welling Committed by Dmitry Torokhov
Browse files

Input: tsc2005 - separate SPI and core functions 



This patch separates the SPI functionality from core functionality
that overlaps with the tsc2004.

Prepares kernel for new tsc2004 driver without much redundant code.

Signed-off-by: default avatarMichael Welling <mwelling@ieee.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent bf5f18d7

drivers/input/touchscreen/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -939,10 +939,14 @@ config TOUCHSCREEN_TSC_SERIO 
	  To compile this driver as a module, choose M here: the

	  module will be called tsc40.



config TOUCHSCREEN_TSC200X_CORE

	tristate



config TOUCHSCREEN_TSC2005

	tristate "TSC2005 based touchscreens"

	depends on SPI_MASTER

	select REGMAP_SPI

	select TOUCHSCREEN_TSC200X_CORE

	help

	  Say Y here if you have a TSC2005 based touchscreen.

drivers/input/touchscreen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o 
obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT)	+= touchright.o

obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN)	+= touchwin.o

obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO)	+= tsc40.o

obj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE)	+= tsc200x-core.o

obj-$(CONFIG_TOUCHSCREEN_TSC2005)	+= tsc2005.o

obj-$(CONFIG_TOUCHSCREEN_TSC2007)	+= tsc2007.o

obj-$(CONFIG_TOUCHSCREEN_UCB1400)	+= ucb1400_ts.o

drivers/input/touchscreen/tsc2005.c

+17 −695

File changed.

Preview size limit exceeded, changes collapsed.

drivers/input/touchscreen/tsc200x-core.c

0 → 100644
+665 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/input/touchscreen/tsc200x-core.h

0 → 100644
+78 −0
Original line number Diff line number Diff line 
#ifndef _TSC200X_CORE_H

#define _TSC200X_CORE_H



/* control byte 1 */

#define TSC2005_CMD			0x80

#define TSC2005_CMD_NORMAL		0x00

#define TSC2005_CMD_STOP		0x01

#define TSC2005_CMD_12BIT		0x04



/* control byte 0 */

#define TSC2005_REG_READ		0x01 /* R/W access */

#define TSC2005_REG_PND0		0x02 /* Power Not Down Control */

#define TSC2005_REG_X			(0x0 << 3)

#define TSC2005_REG_Y			(0x1 << 3)

#define TSC2005_REG_Z1			(0x2 << 3)

#define TSC2005_REG_Z2			(0x3 << 3)

#define TSC2005_REG_AUX			(0x4 << 3)

#define TSC2005_REG_TEMP1		(0x5 << 3)

#define TSC2005_REG_TEMP2		(0x6 << 3)

#define TSC2005_REG_STATUS		(0x7 << 3)

#define TSC2005_REG_AUX_HIGH		(0x8 << 3)

#define TSC2005_REG_AUX_LOW		(0x9 << 3)

#define TSC2005_REG_TEMP_HIGH		(0xA << 3)

#define TSC2005_REG_TEMP_LOW		(0xB << 3)

#define TSC2005_REG_CFR0		(0xC << 3)

#define TSC2005_REG_CFR1		(0xD << 3)

#define TSC2005_REG_CFR2		(0xE << 3)

#define TSC2005_REG_CONV_FUNC		(0xF << 3)



/* configuration register 0 */

#define TSC2005_CFR0_PRECHARGE_276US	0x0040

#define TSC2005_CFR0_STABTIME_1MS	0x0300

#define TSC2005_CFR0_CLOCK_1MHZ		0x1000

#define TSC2005_CFR0_RESOLUTION12	0x2000

#define TSC2005_CFR0_PENMODE		0x8000

#define TSC2005_CFR0_INITVALUE		(TSC2005_CFR0_STABTIME_1MS    | \

					 TSC2005_CFR0_CLOCK_1MHZ      | \

					 TSC2005_CFR0_RESOLUTION12    | \

					 TSC2005_CFR0_PRECHARGE_276US | \

					 TSC2005_CFR0_PENMODE)



/* bits common to both read and write of configuration register 0 */

#define	TSC2005_CFR0_RW_MASK		0x3fff



/* configuration register 1 */

#define TSC2005_CFR1_BATCHDELAY_4MS	0x0003

#define TSC2005_CFR1_INITVALUE		TSC2005_CFR1_BATCHDELAY_4MS



/* configuration register 2 */

#define TSC2005_CFR2_MAVE_Z		0x0004

#define TSC2005_CFR2_MAVE_Y		0x0008

#define TSC2005_CFR2_MAVE_X		0x0010

#define TSC2005_CFR2_AVG_7		0x0800

#define TSC2005_CFR2_MEDIUM_15		0x3000

#define TSC2005_CFR2_INITVALUE		(TSC2005_CFR2_MAVE_X	| \

					 TSC2005_CFR2_MAVE_Y	| \

					 TSC2005_CFR2_MAVE_Z	| \

					 TSC2005_CFR2_MEDIUM_15	| \

					 TSC2005_CFR2_AVG_7)



#define MAX_12BIT			0xfff

#define TSC2005_DEF_X_FUZZ		4

#define TSC2005_DEF_Y_FUZZ		8

#define TSC2005_DEF_P_FUZZ		2

#define TSC2005_DEF_RESISTOR		280



#define TSC2005_SPI_MAX_SPEED_HZ       10000000

#define TSC2005_PENUP_TIME_MS		40



extern const struct regmap_config tsc200x_regmap_config;

extern const struct dev_pm_ops tsc200x_pm_ops;



int tsc200x_probe(struct device *dev, int irq, __u16 bustype,

		  struct regmap *regmap,

		  int (*tsc200x_cmd)(struct device *dev, u8 cmd));

int tsc200x_remove(struct device *dev);



#endif