Skip to content

L
linux
Commit 7686b108 authored by Iiro Valkonen's avatar Iiro Valkonen Committed by Dmitry Torokhov
Browse files
Options

Input: atmel_mxt_ts - get rid of qt602240 prefixes in names 

Change prefixes from qt602240 to mxt to reflect that the driver supports
whole line of mXT touchscreens.
Signed-off-by: default avatarIiro Valkonen <iiro.valkonen@atmel.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 964de521
Hide whitespace changes
Inline Side-by-side
Showing with 481 additions and 480 deletions
arch/arm/mach-s5pv210/mach-goni.c
View file @ 7686b108
...@@ -222,7 +222,7 @@ static void __init goni_radio_init(void) ...@@ -222,7 +222,7 @@ static void __init goni_radio_init(void)
} }
/* TSP */ /* TSP */
static struct qt602240_platform_data qt602240_platform_data = { static struct mxt_platform_data qt602240_platform_data = {
.x_line = 17, .x_line = 17,
.y_line = 11, .y_line = 11,
.x_size = 800, .x_size = 800,
...@@ -230,7 +230,7 @@ static struct qt602240_platform_data qt602240_platform_data = { ...@@ -230,7 +230,7 @@ static struct qt602240_platform_data qt602240_platform_data = {
.blen = 0x21, .blen = 0x21,
.threshold = 0x28, .threshold = 0x28,
.voltage = 2800000, /* 2.8V */ .voltage = 2800000, /* 2.8V */
.orient = QT602240_DIAGONAL, .orient = MXT_DIAGONAL,
}; };
static struct s3c2410_platform_i2c i2c2_data __initdata = { static struct s3c2410_platform_i2c i2c2_data __initdata = {
......
drivers/input/touchscreen/atmel_mxt_ts.c
View file @ 7686b108
/* /*
* AT42QT602240/ATMXT224 Touchscreen driver * Atmel maXTouch Touchscreen driver
* *
* Copyright (C) 2010 Samsung Electronics Co.Ltd * Copyright (C) 2010 Samsung Electronics Co.Ltd
* Author: Joonyoung Shim <jy0922.shim@samsung.com> * Author: Joonyoung Shim <jy0922.shim@samsung.com>
...@@ -22,300 +22,300 @@ ...@@ -22,300 +22,300 @@
#include <linux/slab.h> #include <linux/slab.h>
/* Version */ /* Version */
#define QT602240_VER_20 20 #define MXT_VER_20 20
#define QT602240_VER_21 21 #define MXT_VER_21 21
#define QT602240_VER_22 22 #define MXT_VER_22 22
/* Slave addresses */ /* Slave addresses */
#define QT602240_APP_LOW 0x4a #define MXT_APP_LOW 0x4a
#define QT602240_APP_HIGH 0x4b #define MXT_APP_HIGH 0x4b
#define QT602240_BOOT_LOW 0x24 #define MXT_BOOT_LOW 0x24
#define QT602240_BOOT_HIGH 0x25 #define MXT_BOOT_HIGH 0x25
/* Firmware */ /* Firmware */
#define QT602240_FW_NAME "qt602240.fw" #define MXT_FW_NAME "maxtouch.fw"
/* Registers */ /* Registers */
#define QT602240_FAMILY_ID 0x00 #define MXT_FAMILY_ID 0x00
#define QT602240_VARIANT_ID 0x01 #define MXT_VARIANT_ID 0x01
#define QT602240_VERSION 0x02 #define MXT_VERSION 0x02
#define QT602240_BUILD 0x03 #define MXT_BUILD 0x03
#define QT602240_MATRIX_X_SIZE 0x04 #define MXT_MATRIX_X_SIZE 0x04
#define QT602240_MATRIX_Y_SIZE 0x05 #define MXT_MATRIX_Y_SIZE 0x05
#define QT602240_OBJECT_NUM 0x06 #define MXT_OBJECT_NUM 0x06
#define QT602240_OBJECT_START 0x07 #define MXT_OBJECT_START 0x07
#define QT602240_OBJECT_SIZE 6 #define MXT_OBJECT_SIZE 6
/* Object types */ /* Object types */
#define QT602240_DEBUG_DIAGNOSTIC 37 #define MXT_DEBUG_DIAGNOSTIC 37
#define QT602240_GEN_MESSAGE 5 #define MXT_GEN_MESSAGE 5
#define QT602240_GEN_COMMAND 6 #define MXT_GEN_COMMAND 6
#define QT602240_GEN_POWER 7 #define MXT_GEN_POWER 7
#define QT602240_GEN_ACQUIRE 8 #define MXT_GEN_ACQUIRE 8
#define QT602240_TOUCH_MULTI 9 #define MXT_TOUCH_MULTI 9
#define QT602240_TOUCH_KEYARRAY 15 #define MXT_TOUCH_KEYARRAY 15
#define QT602240_TOUCH_PROXIMITY 23 #define MXT_TOUCH_PROXIMITY 23
#define QT602240_PROCI_GRIPFACE 20 #define MXT_PROCI_GRIPFACE 20
#define QT602240_PROCG_NOISE 22 #define MXT_PROCG_NOISE 22
#define QT602240_PROCI_ONETOUCH 24 #define MXT_PROCI_ONETOUCH 24
#define QT602240_PROCI_TWOTOUCH 27 #define MXT_PROCI_TWOTOUCH 27
#define QT602240_SPT_COMMSCONFIG 18 /* firmware ver 21 over */ #define MXT_SPT_COMMSCONFIG 18 /* firmware ver 21 over */
#define QT602240_SPT_GPIOPWM 19 #define MXT_SPT_GPIOPWM 19
#define QT602240_SPT_SELFTEST 25 #define MXT_SPT_SELFTEST 25
#define QT602240_SPT_CTECONFIG 28 #define MXT_SPT_CTECONFIG 28
#define QT602240_SPT_USERDATA 38 /* firmware ver 21 over */ #define MXT_SPT_USERDATA 38 /* firmware ver 21 over */
/* QT602240_GEN_COMMAND field */ /* MXT_GEN_COMMAND field */
#define QT602240_COMMAND_RESET 0 #define MXT_COMMAND_RESET 0
#define QT602240_COMMAND_BACKUPNV 1 #define MXT_COMMAND_BACKUPNV 1
#define QT602240_COMMAND_CALIBRATE 2 #define MXT_COMMAND_CALIBRATE 2
#define QT602240_COMMAND_REPORTALL 3 #define MXT_COMMAND_REPORTALL 3
#define QT602240_COMMAND_DIAGNOSTIC 5 #define MXT_COMMAND_DIAGNOSTIC 5
/* QT602240_GEN_POWER field */ /* MXT_GEN_POWER field */
#define QT602240_POWER_IDLEACQINT 0 #define MXT_POWER_IDLEACQINT 0
#define QT602240_POWER_ACTVACQINT 1 #define MXT_POWER_ACTVACQINT 1
#define QT602240_POWER_ACTV2IDLETO 2 #define MXT_POWER_ACTV2IDLETO 2
/* QT602240_GEN_ACQUIRE field */ /* MXT_GEN_ACQUIRE field */
#define QT602240_ACQUIRE_CHRGTIME 0 #define MXT_ACQUIRE_CHRGTIME 0
#define QT602240_ACQUIRE_TCHDRIFT 2 #define MXT_ACQUIRE_TCHDRIFT 2
#define QT602240_ACQUIRE_DRIFTST 3 #define MXT_ACQUIRE_DRIFTST 3
#define QT602240_ACQUIRE_TCHAUTOCAL 4 #define MXT_ACQUIRE_TCHAUTOCAL 4
#define QT602240_ACQUIRE_SYNC 5 #define MXT_ACQUIRE_SYNC 5
#define QT602240_ACQUIRE_ATCHCALST 6 #define MXT_ACQUIRE_ATCHCALST 6
#define QT602240_ACQUIRE_ATCHCALSTHR 7 #define MXT_ACQUIRE_ATCHCALSTHR 7
/* QT602240_TOUCH_MULTI field */ /* MXT_TOUCH_MULTI field */
#define QT602240_TOUCH_CTRL 0 #define MXT_TOUCH_CTRL 0
#define QT602240_TOUCH_XORIGIN 1 #define MXT_TOUCH_XORIGIN 1
#define QT602240_TOUCH_YORIGIN 2 #define MXT_TOUCH_YORIGIN 2
#define QT602240_TOUCH_XSIZE 3 #define MXT_TOUCH_XSIZE 3
#define QT602240_TOUCH_YSIZE 4 #define MXT_TOUCH_YSIZE 4
#define QT602240_TOUCH_BLEN 6 #define MXT_TOUCH_BLEN 6
#define QT602240_TOUCH_TCHTHR 7 #define MXT_TOUCH_TCHTHR 7
#define QT602240_TOUCH_TCHDI 8 #define MXT_TOUCH_TCHDI 8
#define QT602240_TOUCH_ORIENT 9 #define MXT_TOUCH_ORIENT 9
#define QT602240_TOUCH_MOVHYSTI 11 #define MXT_TOUCH_MOVHYSTI 11
#define QT602240_TOUCH_MOVHYSTN 12 #define MXT_TOUCH_MOVHYSTN 12
#define QT602240_TOUCH_NUMTOUCH 14 #define MXT_TOUCH_NUMTOUCH 14
#define QT602240_TOUCH_MRGHYST 15 #define MXT_TOUCH_MRGHYST 15
#define QT602240_TOUCH_MRGTHR 16 #define MXT_TOUCH_MRGTHR 16
#define QT602240_TOUCH_AMPHYST 17 #define MXT_TOUCH_AMPHYST 17
#define QT602240_TOUCH_XRANGE_LSB 18 #define MXT_TOUCH_XRANGE_LSB 18
#define QT602240_TOUCH_XRANGE_MSB 19 #define MXT_TOUCH_XRANGE_MSB 19
#define QT602240_TOUCH_YRANGE_LSB 20 #define MXT_TOUCH_YRANGE_LSB 20
#define QT602240_TOUCH_YRANGE_MSB 21 #define MXT_TOUCH_YRANGE_MSB 21
#define QT602240_TOUCH_XLOCLIP 22 #define MXT_TOUCH_XLOCLIP 22
#define QT602240_TOUCH_XHICLIP 23 #define MXT_TOUCH_XHICLIP 23
#define QT602240_TOUCH_YLOCLIP 24 #define MXT_TOUCH_YLOCLIP 24
#define QT602240_TOUCH_YHICLIP 25 #define MXT_TOUCH_YHICLIP 25
#define QT602240_TOUCH_XEDGECTRL 26 #define MXT_TOUCH_XEDGECTRL 26
#define QT602240_TOUCH_XEDGEDIST 27 #define MXT_TOUCH_XEDGEDIST 27
#define QT602240_TOUCH_YEDGECTRL 28 #define MXT_TOUCH_YEDGECTRL 28
#define QT602240_TOUCH_YEDGEDIST 29 #define MXT_TOUCH_YEDGEDIST 29
#define QT602240_TOUCH_JUMPLIMIT 30 /* firmware ver 22 over */ #define MXT_TOUCH_JUMPLIMIT 30 /* firmware ver 22 over */
/* QT602240_PROCI_GRIPFACE field */ /* MXT_PROCI_GRIPFACE field */
#define QT602240_GRIPFACE_CTRL 0 #define MXT_GRIPFACE_CTRL 0
#define QT602240_GRIPFACE_XLOGRIP 1 #define MXT_GRIPFACE_XLOGRIP 1
#define QT602240_GRIPFACE_XHIGRIP 2 #define MXT_GRIPFACE_XHIGRIP 2
#define QT602240_GRIPFACE_YLOGRIP 3 #define MXT_GRIPFACE_YLOGRIP 3
#define QT602240_GRIPFACE_YHIGRIP 4 #define MXT_GRIPFACE_YHIGRIP 4
#define QT602240_GRIPFACE_MAXTCHS 5 #define MXT_GRIPFACE_MAXTCHS 5
#define QT602240_GRIPFACE_SZTHR1 7 #define MXT_GRIPFACE_SZTHR1 7
#define QT602240_GRIPFACE_SZTHR2 8 #define MXT_GRIPFACE_SZTHR2 8
#define QT602240_GRIPFACE_SHPTHR1 9 #define MXT_GRIPFACE_SHPTHR1 9
#define QT602240_GRIPFACE_SHPTHR2 10 #define MXT_GRIPFACE_SHPTHR2 10
#define QT602240_GRIPFACE_SUPEXTTO 11 #define MXT_GRIPFACE_SUPEXTTO 11
/* QT602240_PROCI_NOISE field */ /* MXT_PROCI_NOISE field */
#define QT602240_NOISE_CTRL 0 #define MXT_NOISE_CTRL 0
#define QT602240_NOISE_OUTFLEN 1 #define MXT_NOISE_OUTFLEN 1
#define QT602240_NOISE_GCAFUL_LSB 3 #define MXT_NOISE_GCAFUL_LSB 3
#define QT602240_NOISE_GCAFUL_MSB 4 #define MXT_NOISE_GCAFUL_MSB 4
#define QT602240_NOISE_GCAFLL_LSB 5 #define MXT_NOISE_GCAFLL_LSB 5
#define QT602240_NOISE_GCAFLL_MSB 6 #define MXT_NOISE_GCAFLL_MSB 6
#define QT602240_NOISE_ACTVGCAFVALID 7 #define MXT_NOISE_ACTVGCAFVALID 7
#define QT602240_NOISE_NOISETHR 8 #define MXT_NOISE_NOISETHR 8
#define QT602240_NOISE_FREQHOPSCALE 10 #define MXT_NOISE_FREQHOPSCALE 10
#define QT602240_NOISE_FREQ0 11 #define MXT_NOISE_FREQ0 11
#define QT602240_NOISE_FREQ1 12 #define MXT_NOISE_FREQ1 12
#define QT602240_NOISE_FREQ2 13 #define MXT_NOISE_FREQ2 13
#define QT602240_NOISE_FREQ3 14 #define MXT_NOISE_FREQ3 14
#define QT602240_NOISE_FREQ4 15 #define MXT_NOISE_FREQ4 15
#define QT602240_NOISE_IDLEGCAFVALID 16 #define MXT_NOISE_IDLEGCAFVALID 16
/* QT602240_SPT_COMMSCONFIG */ /* MXT_SPT_COMMSCONFIG */
#define QT602240_COMMS_CTRL 0 #define MXT_COMMS_CTRL 0
#define QT602240_COMMS_CMD 1 #define MXT_COMMS_CMD 1
/* QT602240_SPT_CTECONFIG field */ /* MXT_SPT_CTECONFIG field */
#define QT602240_CTE_CTRL 0 #define MXT_CTE_CTRL 0
#define QT602240_CTE_CMD 1 #define MXT_CTE_CMD 1
#define QT602240_CTE_MODE 2 #define MXT_CTE_MODE 2
#define QT602240_CTE_IDLEGCAFDEPTH 3 #define MXT_CTE_IDLEGCAFDEPTH 3
#define QT602240_CTE_ACTVGCAFDEPTH 4 #define MXT_CTE_ACTVGCAFDEPTH 4
#define QT602240_CTE_VOLTAGE 5 /* firmware ver 21 over */ #define MXT_CTE_VOLTAGE 5 /* firmware ver 21 over */
#define QT602240_VOLTAGE_DEFAULT 2700000 #define MXT_VOLTAGE_DEFAULT 2700000
#define QT602240_VOLTAGE_STEP 10000 #define MXT_VOLTAGE_STEP 10000
/* Define for QT602240_GEN_COMMAND */ /* Define for MXT_GEN_COMMAND */
#define QT602240_BOOT_VALUE 0xa5 #define MXT_BOOT_VALUE 0xa5
#define QT602240_BACKUP_VALUE 0x55 #define MXT_BACKUP_VALUE 0x55
#define QT602240_BACKUP_TIME 25 /* msec */ #define MXT_BACKUP_TIME 25 /* msec */
#define QT602240_RESET_TIME 65 /* msec */ #define MXT_RESET_TIME 65 /* msec */
#define QT602240_FWRESET_TIME 175 /* msec */ #define MXT_FWRESET_TIME 175 /* msec */
/* Command to unlock bootloader */ /* Command to unlock bootloader */
#define QT602240_UNLOCK_CMD_MSB 0xaa #define MXT_UNLOCK_CMD_MSB 0xaa
#define QT602240_UNLOCK_CMD_LSB 0xdc #define MXT_UNLOCK_CMD_LSB 0xdc
/* Bootloader mode status */ /* Bootloader mode status */
#define QT602240_WAITING_BOOTLOAD_CMD 0xc0 /* valid 7 6 bit only */ #define MXT_WAITING_BOOTLOAD_CMD 0xc0 /* valid 7 6 bit only */
#define QT602240_WAITING_FRAME_DATA 0x80 /* valid 7 6 bit only */ #define MXT_WAITING_FRAME_DATA 0x80 /* valid 7 6 bit only */
#define QT602240_FRAME_CRC_CHECK 0x02 #define MXT_FRAME_CRC_CHECK 0x02
#define QT602240_FRAME_CRC_FAIL 0x03 #define MXT_FRAME_CRC_FAIL 0x03
#define QT602240_FRAME_CRC_PASS 0x04 #define MXT_FRAME_CRC_PASS 0x04
#define QT602240_APP_CRC_FAIL 0x40 /* valid 7 8 bit only */ #define MXT_APP_CRC_FAIL 0x40 /* valid 7 8 bit only */
#define QT602240_BOOT_STATUS_MASK 0x3f #define MXT_BOOT_STATUS_MASK 0x3f
/* Touch status */ /* Touch status */
#define QT602240_SUPPRESS (1 << 1) #define MXT_SUPPRESS (1 << 1)
#define QT602240_AMP (1 << 2) #define MXT_AMP (1 << 2)
#define QT602240_VECTOR (1 << 3) #define MXT_VECTOR (1 << 3)
#define QT602240_MOVE (1 << 4) #define MXT_MOVE (1 << 4)
#define QT602240_RELEASE (1 << 5) #define MXT_RELEASE (1 << 5)
#define QT602240_PRESS (1 << 6) #define MXT_PRESS (1 << 6)
#define QT602240_DETECT (1 << 7) #define MXT_DETECT (1 << 7)
/* Touchscreen absolute values */ /* Touchscreen absolute values */
#define QT602240_MAX_XC 0x3ff #define MXT_MAX_XC 0x3ff
#define QT602240_MAX_YC 0x3ff #define MXT_MAX_YC 0x3ff
#define QT602240_MAX_AREA 0xff #define MXT_MAX_AREA 0xff
#define QT602240_MAX_FINGER 10 #define MXT_MAX_FINGER 10
/* Initial register values recommended from chip vendor */ /* Initial register values recommended from chip vendor */
static const u8 init_vals_ver_20[] = { static const u8 init_vals_ver_20[] = {
/* QT602240_GEN_COMMAND(6) */ /* MXT_GEN_COMMAND(6) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_GEN_POWER(7) */ /* MXT_GEN_POWER(7) */
0x20, 0xff, 0x32, 0x20, 0xff, 0x32,
/* QT602240_GEN_ACQUIRE(8) */ /* MXT_GEN_ACQUIRE(8) */
0x08, 0x05, 0x05, 0x00, 0x00, 0x00, 0x05, 0x14, 0x08, 0x05, 0x05, 0x00, 0x00, 0x00, 0x05, 0x14,
/* QT602240_TOUCH_MULTI(9) */ /* MXT_TOUCH_MULTI(9) */
0x00, 0x00, 0x00, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x11, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00,
0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x64,
/* QT602240_TOUCH_KEYARRAY(15) */ /* MXT_TOUCH_KEYARRAY(15) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00,
/* QT602240_SPT_GPIOPWM(19) */ /* MXT_SPT_GPIOPWM(19) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_GRIPFACE(20) */ /* MXT_PROCI_GRIPFACE(20) */
0x00, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x1e, 0x14, 0x04, 0x00, 0x64, 0x64, 0x64, 0x64, 0x00, 0x00, 0x1e, 0x14, 0x04,
0x1e, 0x00, 0x1e, 0x00,
/* QT602240_PROCG_NOISE(22) */ /* MXT_PROCG_NOISE(22) */
0x05, 0x00, 0x00, 0x19, 0x00, 0xe7, 0xff, 0x04, 0x32, 0x00, 0x05, 0x00, 0x00, 0x19, 0x00, 0xe7, 0xff, 0x04, 0x32, 0x00,
0x01, 0x0a, 0x0f, 0x14, 0x00, 0x00, 0xe8, 0x01, 0x0a, 0x0f, 0x14, 0x00, 0x00, 0xe8,
/* QT602240_TOUCH_PROXIMITY(23) */ /* MXT_TOUCH_PROXIMITY(23) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_ONETOUCH(24) */ /* MXT_PROCI_ONETOUCH(24) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_SPT_SELFTEST(25) */ /* MXT_SPT_SELFTEST(25) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_TWOTOUCH(27) */ /* MXT_PROCI_TWOTOUCH(27) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_SPT_CTECONFIG(28) */ /* MXT_SPT_CTECONFIG(28) */
0x00, 0x00, 0x00, 0x04, 0x08, 0x00, 0x00, 0x00, 0x04, 0x08,
}; };
static const u8 init_vals_ver_21[] = { static const u8 init_vals_ver_21[] = {
/* QT602240_GEN_COMMAND(6) */ /* MXT_GEN_COMMAND(6) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_GEN_POWER(7) */ /* MXT_GEN_POWER(7) */
0x20, 0xff, 0x32, 0x20, 0xff, 0x32,
/* QT602240_GEN_ACQUIRE(8) */ /* MXT_GEN_ACQUIRE(8) */
0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
/* QT602240_TOUCH_MULTI(9) */ /* MXT_TOUCH_MULTI(9) */
0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_TOUCH_KEYARRAY(15) */ /* MXT_TOUCH_KEYARRAY(15) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00,
/* QT602240_SPT_GPIOPWM(19) */ /* MXT_SPT_GPIOPWM(19) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_GRIPFACE(20) */ /* MXT_PROCI_GRIPFACE(20) */
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
0x0f, 0x0a, 0x0f, 0x0a,
/* QT602240_PROCG_NOISE(22) */ /* MXT_PROCG_NOISE(22) */
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03, 0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
/* QT602240_TOUCH_PROXIMITY(23) */ /* MXT_TOUCH_PROXIMITY(23) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_ONETOUCH(24) */ /* MXT_PROCI_ONETOUCH(24) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_SPT_SELFTEST(25) */ /* MXT_SPT_SELFTEST(25) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_TWOTOUCH(27) */ /* MXT_PROCI_TWOTOUCH(27) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_SPT_CTECONFIG(28) */ /* MXT_SPT_CTECONFIG(28) */
0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00,
}; };
static const u8 init_vals_ver_22[] = { static const u8 init_vals_ver_22[] = {
/* QT602240_GEN_COMMAND(6) */ /* MXT_GEN_COMMAND(6) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_GEN_POWER(7) */ /* MXT_GEN_POWER(7) */
0x20, 0xff, 0x32, 0x20, 0xff, 0x32,
/* QT602240_GEN_ACQUIRE(8) */ /* MXT_GEN_ACQUIRE(8) */
0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23, 0x0a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x09, 0x23,
/* QT602240_TOUCH_MULTI(9) */ /* MXT_TOUCH_MULTI(9) */
0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x13, 0x0b, 0x00, 0x00, 0x00, 0x02, 0x00,
0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0e, 0x0a, 0x0a, 0x0a, 0x0a, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00,
/* QT602240_TOUCH_KEYARRAY(15) */ /* MXT_TOUCH_KEYARRAY(15) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00,
/* QT602240_SPT_GPIOPWM(19) */ /* MXT_SPT_GPIOPWM(19) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_GRIPFACE(20) */ /* MXT_PROCI_GRIPFACE(20) */
0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x28, 0x04,
0x0f, 0x0a, 0x0f, 0x0a,
/* QT602240_PROCG_NOISE(22) */ /* MXT_PROCG_NOISE(22) */
0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x23, 0x00,
0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03, 0x00, 0x05, 0x0f, 0x19, 0x23, 0x2d, 0x03,
/* QT602240_TOUCH_PROXIMITY(23) */ /* MXT_TOUCH_PROXIMITY(23) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_ONETOUCH(24) */ /* MXT_PROCI_ONETOUCH(24) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_SPT_SELFTEST(25) */ /* MXT_SPT_SELFTEST(25) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_PROCI_TWOTOUCH(27) */ /* MXT_PROCI_TWOTOUCH(27) */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
/* QT602240_SPT_CTECONFIG(28) */ /* MXT_SPT_CTECONFIG(28) */
0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00,
}; };
struct qt602240_info { struct mxt_info {
u8 family_id; u8 family_id;
u8 variant_id; u8 variant_id;
u8 version; u8 version;
...@@ -325,7 +325,7 @@ struct qt602240_info { ...@@ -325,7 +325,7 @@ struct qt602240_info {
u8 object_num; u8 object_num;
}; };
struct qt602240_object { struct mxt_object {
u8 type; u8 type;
u16 start_address; u16 start_address;
u8 size; u8 size;
...@@ -336,13 +336,13 @@ struct qt602240_object { ...@@ -336,13 +336,13 @@ struct qt602240_object {
u8 max_reportid; u8 max_reportid;
}; };
struct qt602240_message { struct mxt_message {
u8 reportid; u8 reportid;
u8 message[7]; u8 message[7];
u8 checksum; u8 checksum;
}; };
struct qt602240_finger { struct mxt_finger {
int status; int status;
int x; int x;
int y; int y;
...@@ -350,65 +350,65 @@ struct qt602240_finger { ...@@ -350,65 +350,65 @@ struct qt602240_finger {
}; };
/* Each client has this additional data */ /* Each client has this additional data */
struct qt602240_data { struct mxt_data {
struct i2c_client *client; struct i2c_client *client;
struct input_dev *input_dev; struct input_dev *input_dev;
const struct qt602240_platform_data *pdata; const struct mxt_platform_data *pdata;
struct qt602240_object *object_table; struct mxt_object *object_table;
struct qt602240_info info; struct mxt_info info;
struct qt602240_finger finger[QT602240_MAX_FINGER]; struct mxt_finger finger[MXT_MAX_FINGER];
unsigned int irq; unsigned int irq;
}; };
static bool qt602240_object_readable(unsigned int type) static bool mxt_object_readable(unsigned int type)
{ {
switch (type) { switch (type) {
case QT602240_GEN_MESSAGE: case MXT_GEN_MESSAGE:
case QT602240_GEN_COMMAND: case MXT_GEN_COMMAND:
case QT602240_GEN_POWER: case MXT_GEN_POWER:
case QT602240_GEN_ACQUIRE: case MXT_GEN_ACQUIRE:
case QT602240_TOUCH_MULTI: case MXT_TOUCH_MULTI:
case QT602240_TOUCH_KEYARRAY: case MXT_TOUCH_KEYARRAY:
case QT602240_TOUCH_PROXIMITY: case MXT_TOUCH_PROXIMITY:
case QT602240_PROCI_GRIPFACE: case MXT_PROCI_GRIPFACE:
case QT602240_PROCG_NOISE: case MXT_PROCG_NOISE:
case QT602240_PROCI_ONETOUCH: case MXT_PROCI_ONETOUCH:
case QT602240_PROCI_TWOTOUCH: case MXT_PROCI_TWOTOUCH:
case QT602240_SPT_COMMSCONFIG: case MXT_SPT_COMMSCONFIG:
case QT602240_SPT_GPIOPWM: case MXT_SPT_GPIOPWM:
case QT602240_SPT_SELFTEST: case MXT_SPT_SELFTEST:
case QT602240_SPT_CTECONFIG: case MXT_SPT_CTECONFIG:
case QT602240_SPT_USERDATA: case MXT_SPT_USERDATA:
return true; return true;
default: default:
return false; return false;
} }
} }
static bool qt602240_object_writable(unsigned int type) static bool mxt_object_writable(unsigned int type)
{ {
switch (type) { switch (type) {
case QT602240_GEN_COMMAND: case MXT_GEN_COMMAND:
case QT602240_GEN_POWER: case MXT_GEN_POWER:
case QT602240_GEN_ACQUIRE: case MXT_GEN_ACQUIRE:
case QT602240_TOUCH_MULTI: case MXT_TOUCH_MULTI:
case QT602240_TOUCH_KEYARRAY: case MXT_TOUCH_KEYARRAY:
case QT602240_TOUCH_PROXIMITY: case MXT_TOUCH_PROXIMITY:
case QT602240_PROCI_GRIPFACE: case MXT_PROCI_GRIPFACE:
case QT602240_PROCG_NOISE: case MXT_PROCG_NOISE:
case QT602240_PROCI_ONETOUCH: case MXT_PROCI_ONETOUCH:
case QT602240_PROCI_TWOTOUCH: case MXT_PROCI_TWOTOUCH:
case QT602240_SPT_GPIOPWM: case MXT_SPT_GPIOPWM:
case QT602240_SPT_SELFTEST: case MXT_SPT_SELFTEST:
case QT602240_SPT_CTECONFIG: case MXT_SPT_CTECONFIG:
return true; return true;
default: default:
return false; return false;
} }
} }
static void qt602240_dump_message(struct device *dev, static void mxt_dump_message(struct device *dev,
struct qt602240_message *message) struct mxt_message *message)
{ {
dev_dbg(dev, "reportid:\t0x%x\n", message->reportid); dev_dbg(dev, "reportid:\t0x%x\n", message->reportid);
dev_dbg(dev, "message1:\t0x%x\n", message->message[0]); dev_dbg(dev, "message1:\t0x%x\n", message->message[0]);
...@@ -421,7 +421,7 @@ static void qt602240_dump_message(struct device *dev, ...@@ -421,7 +421,7 @@ static void qt602240_dump_message(struct device *dev,
dev_dbg(dev, "checksum:\t0x%x\n", message->checksum); dev_dbg(dev, "checksum:\t0x%x\n", message->checksum);
} }
static int qt602240_check_bootloader(struct i2c_client *client, static int mxt_check_bootloader(struct i2c_client *client,
unsigned int state) unsigned int state)
{ {
u8 val; u8 val;
...@@ -433,12 +433,12 @@ static int qt602240_check_bootloader(struct i2c_client *client, ...@@ -433,12 +433,12 @@ static int qt602240_check_bootloader(struct i2c_client *client,
} }
switch (state) { switch (state) {
case QT602240_WAITING_BOOTLOAD_CMD: case MXT_WAITING_BOOTLOAD_CMD:
case QT602240_WAITING_FRAME_DATA: case MXT_WAITING_FRAME_DATA:
val &= ~QT602240_BOOT_STATUS_MASK; val &= ~MXT_BOOT_STATUS_MASK;
break; break;
case QT602240_FRAME_CRC_PASS: case MXT_FRAME_CRC_PASS:
if (val == QT602240_FRAME_CRC_CHECK) if (val == MXT_FRAME_CRC_CHECK)
goto recheck; goto recheck;
break; break;
default: default:
...@@ -453,12 +453,12 @@ static int qt602240_check_bootloader(struct i2c_client *client, ...@@ -453,12 +453,12 @@ static int qt602240_check_bootloader(struct i2c_client *client,
return 0; return 0;
} }
static int qt602240_unlock_bootloader(struct i2c_client *client) static int mxt_unlock_bootloader(struct i2c_client *client)
{ {
u8 buf[2]; u8 buf[2];
buf[0] = QT602240_UNLOCK_CMD_LSB; buf[0] = MXT_UNLOCK_CMD_LSB;
buf[1] = QT602240_UNLOCK_CMD_MSB; buf[1] = MXT_UNLOCK_CMD_MSB;
if (i2c_master_send(client, buf, 2) != 2) { if (i2c_master_send(client, buf, 2) != 2) {
dev_err(&client->dev, "%s: i2c send failed\n", __func__); dev_err(&client->dev, "%s: i2c send failed\n", __func__);
...@@ -468,7 +468,7 @@ static int qt602240_unlock_bootloader(struct i2c_client *client) ...@@ -468,7 +468,7 @@ static int qt602240_unlock_bootloader(struct i2c_client *client)
return 0; return 0;
} }
static int qt602240_fw_write(struct i2c_client *client, static int mxt_fw_write(struct i2c_client *client,
const u8 *data, unsigned int frame_size) const u8 *data, unsigned int frame_size)
{ {
if (i2c_master_send(client, data, frame_size) != frame_size) { if (i2c_master_send(client, data, frame_size) != frame_size) {
...@@ -479,7 +479,7 @@ static int qt602240_fw_write(struct i2c_client *client, ...@@ -479,7 +479,7 @@ static int qt602240_fw_write(struct i2c_client *client,
return 0; return 0;
} }
static int __qt602240_read_reg(struct i2c_client *client, static int __mxt_read_reg(struct i2c_client *client,
u16 reg, u16 len, void *val) u16 reg, u16 len, void *val)
{ {
struct i2c_msg xfer[2]; struct i2c_msg xfer[2];
...@@ -508,12 +508,12 @@ static int __qt602240_read_reg(struct i2c_client *client, ...@@ -508,12 +508,12 @@ static int __qt602240_read_reg(struct i2c_client *client,
return 0; return 0;
} }
static int qt602240_read_reg(struct i2c_client *client, u16 reg, u8 *val) static int mxt_read_reg(struct i2c_client *client, u16 reg, u8 *val)
{ {
return __qt602240_read_reg(client, reg, 1, val); return __mxt_read_reg(client, reg, 1, val);
} }
static int qt602240_write_reg(struct i2c_client *client, u16 reg, u8 val) static int mxt_write_reg(struct i2c_client *client, u16 reg, u8 val)
{ {
u8 buf[3]; u8 buf[3];
...@@ -529,17 +529,17 @@ static int qt602240_write_reg(struct i2c_client *client, u16 reg, u8 val) ...@@ -529,17 +529,17 @@ static int qt602240_write_reg(struct i2c_client *client, u16 reg, u8 val)
return 0; return 0;
} }
static int qt602240_read_object_table(struct i2c_client *client, static int mxt_read_object_table(struct i2c_client *client,
u16 reg, u8 *object_buf) u16 reg, u8 *object_buf)
{ {
return __qt602240_read_reg(client, reg, QT602240_OBJECT_SIZE, return __mxt_read_reg(client, reg, MXT_OBJECT_SIZE,
object_buf); object_buf);
} }
static struct qt602240_object * static struct mxt_object *
qt602240_get_object(struct qt602240_data *data, u8 type) mxt_get_object(struct mxt_data *data, u8 type)
{ {
struct qt602240_object *object; struct mxt_object *object;
int i; int i;
for (i = 0; i < data->info.object_num; i++) { for (i = 0; i < data->info.object_num; i++) {
...@@ -552,63 +552,63 @@ qt602240_get_object(struct qt602240_data *data, u8 type) ...@@ -552,63 +552,63 @@ qt602240_get_object(struct qt602240_data *data, u8 type)
return NULL; return NULL;
} }
static int qt602240_read_message(struct qt602240_data *data, static int mxt_read_message(struct mxt_data *data,
struct qt602240_message *message) struct mxt_message *message)
{ {
struct qt602240_object *object; struct mxt_object *object;
u16 reg; u16 reg;
object = qt602240_get_object(data, QT602240_GEN_MESSAGE); object = mxt_get_object(data, MXT_GEN_MESSAGE);
if (!object) if (!object)
return -EINVAL; return -EINVAL;
reg = object->start_address; reg = object->start_address;
return __qt602240_read_reg(data->client, reg, return __mxt_read_reg(data->client, reg,
sizeof(struct qt602240_message), message); sizeof(struct mxt_message), message);
} }
static int qt602240_read_object(struct qt602240_data *data, static int mxt_read_object(struct mxt_data *data,
u8 type, u8 offset, u8 *val) u8 type, u8 offset, u8 *val)
{ {
struct qt602240_object *object; struct mxt_object *object;
u16 reg; u16 reg;
object = qt602240_get_object(data, type); object = mxt_get_object(data, type);
if (!object) if (!object)
return -EINVAL; return -EINVAL;
reg = object->start_address; reg = object->start_address;
return __qt602240_read_reg(data->client, reg + offset, 1, val); return __mxt_read_reg(data->client, reg + offset, 1, val);
} }
static int qt602240_write_object(struct qt602240_data *data, static int mxt_write_object(struct mxt_data *data,
u8 type, u8 offset, u8 val) u8 type, u8 offset, u8 val)
{ {
struct qt602240_object *object; struct mxt_object *object;
u16 reg; u16 reg;
object = qt602240_get_object(data, type); object = mxt_get_object(data, type);
if (!object) if (!object)
return -EINVAL; return -EINVAL;
reg = object->start_address; reg = object->start_address;
return qt602240_write_reg(data->client, reg + offset, val); return mxt_write_reg(data->client, reg + offset, val);
} }
static void qt602240_input_report(struct qt602240_data *data, int single_id) static void mxt_input_report(struct mxt_data *data, int single_id)
{ {
struct qt602240_finger *finger = data->finger; struct mxt_finger *finger = data->finger;
struct input_dev *input_dev = data->input_dev; struct input_dev *input_dev = data->input_dev;
int status = finger[single_id].status; int status = finger[single_id].status;
int finger_num = 0; int finger_num = 0;
int id; int id;
for (id = 0; id < QT602240_MAX_FINGER; id++) { for (id = 0; id < MXT_MAX_FINGER; id++) {
if (!finger[id].status) if (!finger[id].status)
continue; continue;
input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR,
finger[id].status != QT602240_RELEASE ? finger[id].status != MXT_RELEASE ?
finger[id].area : 0); finger[id].area : 0);
input_report_abs(input_dev, ABS_MT_POSITION_X, input_report_abs(input_dev, ABS_MT_POSITION_X,
finger[id].x); finger[id].x);
...@@ -616,7 +616,7 @@ static void qt602240_input_report(struct qt602240_data *data, int single_id) ...@@ -616,7 +616,7 @@ static void qt602240_input_report(struct qt602240_data *data, int single_id)
finger[id].y); finger[id].y);
input_mt_sync(input_dev); input_mt_sync(input_dev);
if (finger[id].status == QT602240_RELEASE) if (finger[id].status == MXT_RELEASE)
finger[id].status = 0; finger[id].status = 0;
else else
finger_num++; finger_num++;
...@@ -624,7 +624,7 @@ static void qt602240_input_report(struct qt602240_data *data, int single_id) ...@@ -624,7 +624,7 @@ static void qt602240_input_report(struct qt602240_data *data, int single_id)
input_report_key(input_dev, BTN_TOUCH, finger_num > 0); input_report_key(input_dev, BTN_TOUCH, finger_num > 0);
if (status != QT602240_RELEASE) { if (status != MXT_RELEASE) {
input_report_abs(input_dev, ABS_X, finger[single_id].x); input_report_abs(input_dev, ABS_X, finger[single_id].x);
input_report_abs(input_dev, ABS_Y, finger[single_id].y); input_report_abs(input_dev, ABS_Y, finger[single_id].y);
} }
...@@ -632,10 +632,10 @@ static void qt602240_input_report(struct qt602240_data *data, int single_id) ...@@ -632,10 +632,10 @@ static void qt602240_input_report(struct qt602240_data *data, int single_id)
input_sync(input_dev); input_sync(input_dev);
} }
static void qt602240_input_touchevent(struct qt602240_data *data, static void mxt_input_touchevent(struct mxt_data *data,
struct qt602240_message *message, int id) struct mxt_message *message, int id)
{ {
struct qt602240_finger *finger = data->finger; struct mxt_finger *finger = data->finger;
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
u8 status = message->message[0]; u8 status = message->message[0];
int x; int x;
...@@ -643,18 +643,18 @@ static void qt602240_input_touchevent(struct qt602240_data *data, ...@@ -643,18 +643,18 @@ static void qt602240_input_touchevent(struct qt602240_data *data,
int area; int area;
/* Check the touch is present on the screen */ /* Check the touch is present on the screen */
if (!(status & QT602240_DETECT)) { if (!(status & MXT_DETECT)) {
if (status & QT602240_RELEASE) { if (status & MXT_RELEASE) {
dev_dbg(dev, "[%d] released\n", id); dev_dbg(dev, "[%d] released\n", id);
finger[id].status = QT602240_RELEASE; finger[id].status = MXT_RELEASE;
qt602240_input_report(data, id); mxt_input_report(data, id);
} }
return; return;
} }
/* Check only AMP detection */ /* Check only AMP detection */
if (!(status & (QT602240_PRESS | QT602240_MOVE))) if (!(status & (MXT_PRESS | MXT_MOVE)))
return; return;
x = (message->message[1] << 2) | ((message->message[3] & ~0x3f) >> 6); x = (message->message[1] << 2) | ((message->message[3] & ~0x3f) >> 6);
...@@ -662,23 +662,23 @@ static void qt602240_input_touchevent(struct qt602240_data *data, ...@@ -662,23 +662,23 @@ static void qt602240_input_touchevent(struct qt602240_data *data,
area = message->message[4]; area = message->message[4];
dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id, dev_dbg(dev, "[%d] %s x: %d, y: %d, area: %d\n", id,
status & QT602240_MOVE ? "moved" : "pressed", status & MXT_MOVE ? "moved" : "pressed",
x, y, area); x, y, area);
finger[id].status = status & QT602240_MOVE ? finger[id].status = status & MXT_MOVE ?
QT602240_MOVE : QT602240_PRESS; MXT_MOVE : MXT_PRESS;
finger[id].x = x; finger[id].x = x;
finger[id].y = y; finger[id].y = y;
finger[id].area = area; finger[id].area = area;
qt602240_input_report(data, id); mxt_input_report(data, id);
} }
static irqreturn_t qt602240_interrupt(int irq, void *dev_id) static irqreturn_t mxt_interrupt(int irq, void *dev_id)
{ {
struct qt602240_data *data = dev_id; struct mxt_data *data = dev_id;
struct qt602240_message message; struct mxt_message message;
struct qt602240_object *object; struct mxt_object *object;
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
int id; int id;
u8 reportid; u8 reportid;
...@@ -686,15 +686,15 @@ static irqreturn_t qt602240_interrupt(int irq, void *dev_id) ...@@ -686,15 +686,15 @@ static irqreturn_t qt602240_interrupt(int irq, void *dev_id)
u8 min_reportid; u8 min_reportid;
do { do {
if (qt602240_read_message(data, &message)) { if (mxt_read_message(data, &message)) {
dev_err(dev, "Failed to read message\n"); dev_err(dev, "Failed to read message\n");
goto end; goto end;
} }
reportid = message.reportid; reportid = message.reportid;
/* whether reportid is thing of QT602240_TOUCH_MULTI */ /* whether reportid is thing of MXT_TOUCH_MULTI */
object = qt602240_get_object(data, QT602240_TOUCH_MULTI); object = mxt_get_object(data, MXT_TOUCH_MULTI);
if (!object) if (!object)
goto end; goto end;
...@@ -703,18 +703,18 @@ static irqreturn_t qt602240_interrupt(int irq, void *dev_id) ...@@ -703,18 +703,18 @@ static irqreturn_t qt602240_interrupt(int irq, void *dev_id)
id = reportid - min_reportid; id = reportid - min_reportid;
if (reportid >= min_reportid && reportid <= max_reportid) if (reportid >= min_reportid && reportid <= max_reportid)
qt602240_input_touchevent(data, &message, id); mxt_input_touchevent(data, &message, id);
else else
qt602240_dump_message(dev, &message); mxt_dump_message(dev, &message);
} while (reportid != 0xff); } while (reportid != 0xff);
end: end:
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int qt602240_check_reg_init(struct qt602240_data *data) static int mxt_check_reg_init(struct mxt_data *data)
{ {
struct qt602240_object *object; struct mxt_object *object;
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
int index = 0; int index = 0;
int i, j; int i, j;
...@@ -722,13 +722,13 @@ static int qt602240_check_reg_init(struct qt602240_data *data) ...@@ -722,13 +722,13 @@ static int qt602240_check_reg_init(struct qt602240_data *data)
u8 *init_vals; u8 *init_vals;
switch (version) { switch (version) {
case QT602240_VER_20: case MXT_VER_20:
init_vals = (u8 *)init_vals_ver_20; init_vals = (u8 *)init_vals_ver_20;
break; break;
case QT602240_VER_21: case MXT_VER_21:
init_vals = (u8 *)init_vals_ver_21; init_vals = (u8 *)init_vals_ver_21;
break; break;
case QT602240_VER_22: case MXT_VER_22:
init_vals = (u8 *)init_vals_ver_22; init_vals = (u8 *)init_vals_ver_22;
break; break;
default: default:
...@@ -739,11 +739,11 @@ static int qt602240_check_reg_init(struct qt602240_data *data) ...@@ -739,11 +739,11 @@ static int qt602240_check_reg_init(struct qt602240_data *data)
for (i = 0; i < data->info.object_num; i++) { for (i = 0; i < data->info.object_num; i++) {
object = data->object_table + i; object = data->object_table + i;
if (!qt602240_object_writable(object->type)) if (!mxt_object_writable(object->type))
continue; continue;
for (j = 0; j < object->size + 1; j++) for (j = 0; j < object->size + 1; j++)
qt602240_write_object(data, object->type, j, mxt_write_object(data, object->type, j,
init_vals[index + j]); init_vals[index + j]);
index += object->size + 1; index += object->size + 1;
...@@ -752,9 +752,9 @@ static int qt602240_check_reg_init(struct qt602240_data *data) ...@@ -752,9 +752,9 @@ static int qt602240_check_reg_init(struct qt602240_data *data)
return 0; return 0;
} }
static int qt602240_check_matrix_size(struct qt602240_data *data) static int mxt_check_matrix_size(struct mxt_data *data)
{ {
const struct qt602240_platform_data *pdata = data->pdata; const struct mxt_platform_data *pdata = data->pdata;
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
int mode = -1; int mode = -1;
int error; int error;
...@@ -801,8 +801,8 @@ static int qt602240_check_matrix_size(struct qt602240_data *data) ...@@ -801,8 +801,8 @@ static int qt602240_check_matrix_size(struct qt602240_data *data)
return -EINVAL; return -EINVAL;
} }
error = qt602240_read_object(data, QT602240_SPT_CTECONFIG, error = mxt_read_object(data, MXT_SPT_CTECONFIG,
QT602240_CTE_MODE, &val); MXT_CTE_MODE, &val);
if (error) if (error)
return error; return error;
...@@ -810,17 +810,17 @@ static int qt602240_check_matrix_size(struct qt602240_data *data) ...@@ -810,17 +810,17 @@ static int qt602240_check_matrix_size(struct qt602240_data *data)
return 0; return 0;
/* Change the CTE configuration */ /* Change the CTE configuration */
qt602240_write_object(data, QT602240_SPT_CTECONFIG, mxt_write_object(data, MXT_SPT_CTECONFIG,
QT602240_CTE_CTRL, 1); MXT_CTE_CTRL, 1);
qt602240_write_object(data, QT602240_SPT_CTECONFIG, mxt_write_object(data, MXT_SPT_CTECONFIG,
QT602240_CTE_MODE, mode); MXT_CTE_MODE, mode);
qt602240_write_object(data, QT602240_SPT_CTECONFIG, mxt_write_object(data, MXT_SPT_CTECONFIG,
QT602240_CTE_CTRL, 0); MXT_CTE_CTRL, 0);
return 0; return 0;
} }
static int qt602240_make_highchg(struct qt602240_data *data) static int mxt_make_highchg(struct mxt_data *data)
{ {
struct device *dev = &data->client->dev; struct device *dev = &data->client->dev;
int count = 10; int count = 10;
...@@ -829,7 +829,7 @@ static int qt602240_make_highchg(struct qt602240_data *data) ...@@ -829,7 +829,7 @@ static int qt602240_make_highchg(struct qt602240_data *data)
/* Read dummy message to make high CHG pin */ /* Read dummy message to make high CHG pin */
do { do {
error = qt602240_read_object(data, QT602240_GEN_MESSAGE, 0, &val); error = mxt_read_object(data, MXT_GEN_MESSAGE, 0, &val);
if (error) if (error)
return error; return error;
} while ((val != 0xff) && --count); } while ((val != 0xff) && --count);
...@@ -842,82 +842,82 @@ static int qt602240_make_highchg(struct qt602240_data *data) ...@@ -842,82 +842,82 @@ static int qt602240_make_highchg(struct qt602240_data *data)
return 0; return 0;
} }
static void qt602240_handle_pdata(struct qt602240_data *data) static void mxt_handle_pdata(struct mxt_data *data)
{ {
const struct qt602240_platform_data *pdata = data->pdata; const struct mxt_platform_data *pdata = data->pdata;
u8 voltage; u8 voltage;
/* Set touchscreen lines */ /* Set touchscreen lines */
qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_XSIZE, mxt_write_object(data, MXT_TOUCH_MULTI, MXT_TOUCH_XSIZE,
pdata->x_line); pdata->x_line);
qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_YSIZE, mxt_write_object(data, MXT_TOUCH_MULTI, MXT_TOUCH_YSIZE,
pdata->y_line); pdata->y_line);
/* Set touchscreen orient */ /* Set touchscreen orient */
qt602240_write_object(data, QT602240_TOUCH_MULTI, QT602240_TOUCH_ORIENT, mxt_write_object(data, MXT_TOUCH_MULTI, MXT_TOUCH_ORIENT,
pdata->orient); pdata->orient);
/* Set touchscreen burst length */ /* Set touchscreen burst length */
qt602240_write_object(data, QT602240_TOUCH_MULTI, mxt_write_object(data, MXT_TOUCH_MULTI,
QT602240_TOUCH_BLEN, pdata->blen); MXT_TOUCH_BLEN, pdata->blen);
/* Set touchscreen threshold */ /* Set touchscreen threshold */
qt602240_write_object(data, QT602240_TOUCH_MULTI, mxt_write_object(data, MXT_TOUCH_MULTI,
QT602240_TOUCH_TCHTHR, pdata->threshold); MXT_TOUCH_TCHTHR, pdata->threshold);
/* Set touchscreen resolution */ /* Set touchscreen resolution */
qt602240_write_object(data, QT602240_TOUCH_MULTI, mxt_write_object(data, MXT_TOUCH_MULTI,
QT602240_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff); MXT_TOUCH_XRANGE_LSB, (pdata->x_size - 1) & 0xff);
qt602240_write_object(data, QT602240_TOUCH_MULTI, mxt_write_object(data, MXT_TOUCH_MULTI,
QT602240_TOUCH_XRANGE_MSB, (pdata->x_size - 1) >> 8); MXT_TOUCH_XRANGE_MSB, (pdata->x_size - 1) >> 8);
qt602240_write_object(data, QT602240_TOUCH_MULTI, mxt_write_object(data, MXT_TOUCH_MULTI,
QT602240_TOUCH_YRANGE_LSB, (pdata->y_size - 1) & 0xff); MXT_TOUCH_YRANGE_LSB, (pdata->y_size - 1) & 0xff);
qt602240_write_object(data, QT602240_TOUCH_MULTI, mxt_write_object(data, MXT_TOUCH_MULTI,
QT602240_TOUCH_YRANGE_MSB, (pdata->y_size - 1) >> 8); MXT_TOUCH_YRANGE_MSB, (pdata->y_size - 1) >> 8);
/* Set touchscreen voltage */ /* Set touchscreen voltage */
if (data->info.version >= QT602240_VER_21 && pdata->voltage) { if (data->info.version >= MXT_VER_21 && pdata->voltage) {
if (pdata->voltage < QT602240_VOLTAGE_DEFAULT) { if (pdata->voltage < MXT_VOLTAGE_DEFAULT) {
voltage = (QT602240_VOLTAGE_DEFAULT - pdata->voltage) / voltage = (MXT_VOLTAGE_DEFAULT - pdata->voltage) /
QT602240_VOLTAGE_STEP; MXT_VOLTAGE_STEP;
voltage = 0xff - voltage + 1; voltage = 0xff - voltage + 1;
} else } else
voltage = (pdata->voltage - QT602240_VOLTAGE_DEFAULT) / voltage = (pdata->voltage - MXT_VOLTAGE_DEFAULT) /
QT602240_VOLTAGE_STEP; MXT_VOLTAGE_STEP;
qt602240_write_object(data, QT602240_SPT_CTECONFIG, mxt_write_object(data, MXT_SPT_CTECONFIG,
QT602240_CTE_VOLTAGE, voltage); MXT_CTE_VOLTAGE, voltage);
} }
} }
static int qt602240_get_info(struct qt602240_data *data) static int mxt_get_info(struct mxt_data *data)
{ {
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
struct qt602240_info *info = &data->info; struct mxt_info *info = &data->info;
int error; int error;
u8 val; u8 val;
error = qt602240_read_reg(client, QT602240_FAMILY_ID, &val); error = mxt_read_reg(client, MXT_FAMILY_ID, &val);
if (error) if (error)
return error; return error;
info->family_id = val; info->family_id = val;
error = qt602240_read_reg(client, QT602240_VARIANT_ID, &val); error = mxt_read_reg(client, MXT_VARIANT_ID, &val);
if (error) if (error)
return error; return error;
info->variant_id = val; info->variant_id = val;
error = qt602240_read_reg(client, QT602240_VERSION, &val); error = mxt_read_reg(client, MXT_VERSION, &val);
if (error) if (error)
return error; return error;
info->version = val; info->version = val;
error = qt602240_read_reg(client, QT602240_BUILD, &val); error = mxt_read_reg(client, MXT_BUILD, &val);
if (error) if (error)
return error; return error;
info->build = val; info->build = val;
error = qt602240_read_reg(client, QT602240_OBJECT_NUM, &val); error = mxt_read_reg(client, MXT_OBJECT_NUM, &val);
if (error) if (error)
return error; return error;
info->object_num = val; info->object_num = val;
...@@ -925,19 +925,19 @@ static int qt602240_get_info(struct qt602240_data *data) ...@@ -925,19 +925,19 @@ static int qt602240_get_info(struct qt602240_data *data)
return 0; return 0;
} }
static int qt602240_get_object_table(struct qt602240_data *data) static int mxt_get_object_table(struct mxt_data *data)
{ {
int error; int error;
int i; int i;
u16 reg; u16 reg;
u8 reportid = 0; u8 reportid = 0;
u8 buf[QT602240_OBJECT_SIZE]; u8 buf[MXT_OBJECT_SIZE];
for (i = 0; i < data->info.object_num; i++) { for (i = 0; i < data->info.object_num; i++) {
struct qt602240_object *object = data->object_table + i; struct mxt_object *object = data->object_table + i;
reg = QT602240_OBJECT_START + QT602240_OBJECT_SIZE * i; reg = MXT_OBJECT_START + MXT_OBJECT_SIZE * i;
error = qt602240_read_object_table(data->client, reg, buf); error = mxt_read_object_table(data->client, reg, buf);
if (error) if (error)
return error; return error;
...@@ -957,19 +957,19 @@ static int qt602240_get_object_table(struct qt602240_data *data) ...@@ -957,19 +957,19 @@ static int qt602240_get_object_table(struct qt602240_data *data)
return 0; return 0;
} }
static int qt602240_initialize(struct qt602240_data *data) static int mxt_initialize(struct mxt_data *data)
{ {
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
struct qt602240_info *info = &data->info; struct mxt_info *info = &data->info;
int error; int error;
u8 val; u8 val;
error = qt602240_get_info(data); error = mxt_get_info(data);
if (error) if (error)
return error; return error;
data->object_table = kcalloc(info->object_num, data->object_table = kcalloc(info->object_num,
sizeof(struct qt602240_object), sizeof(struct mxt_object),
GFP_KERNEL); GFP_KERNEL);
if (!data->object_table) { if (!data->object_table) {
dev_err(&client->dev, "Failed to allocate memory\n"); dev_err(&client->dev, "Failed to allocate memory\n");
...@@ -977,44 +977,44 @@ static int qt602240_initialize(struct qt602240_data *data) ...@@ -977,44 +977,44 @@ static int qt602240_initialize(struct qt602240_data *data)
} }
/* Get object table information */ /* Get object table information */
error = qt602240_get_object_table(data); error = mxt_get_object_table(data);
if (error) if (error)
return error; return error;
/* Check register init values */ /* Check register init values */
error = qt602240_check_reg_init(data); error = mxt_check_reg_init(data);
if (error) if (error)
return error; return error;
/* Check X/Y matrix size */ /* Check X/Y matrix size */
error = qt602240_check_matrix_size(data); error = mxt_check_matrix_size(data);
if (error) if (error)
return error; return error;
error = qt602240_make_highchg(data); error = mxt_make_highchg(data);
if (error) if (error)
return error; return error;
qt602240_handle_pdata(data); mxt_handle_pdata(data);
/* Backup to memory */ /* Backup to memory */
qt602240_write_object(data, QT602240_GEN_COMMAND, mxt_write_object(data, MXT_GEN_COMMAND,
QT602240_COMMAND_BACKUPNV, MXT_COMMAND_BACKUPNV,
QT602240_BACKUP_VALUE); MXT_BACKUP_VALUE);
msleep(QT602240_BACKUP_TIME); msleep(MXT_BACKUP_TIME);
/* Soft reset */ /* Soft reset */
qt602240_write_object(data, QT602240_GEN_COMMAND, mxt_write_object(data, MXT_GEN_COMMAND,
QT602240_COMMAND_RESET, 1); MXT_COMMAND_RESET, 1);
msleep(QT602240_RESET_TIME); msleep(MXT_RESET_TIME);
/* Update matrix size at info struct */ /* Update matrix size at info struct */
error = qt602240_read_reg(client, QT602240_MATRIX_X_SIZE, &val); error = mxt_read_reg(client, MXT_MATRIX_X_SIZE, &val);
if (error) if (error)
return error; return error;
info->matrix_xsize = val; info->matrix_xsize = val;
error = qt602240_read_reg(client, QT602240_MATRIX_Y_SIZE, &val); error = mxt_read_reg(client, MXT_MATRIX_Y_SIZE, &val);
if (error) if (error)
return error; return error;
info->matrix_ysize = val; info->matrix_ysize = val;
...@@ -1032,11 +1032,11 @@ static int qt602240_initialize(struct qt602240_data *data) ...@@ -1032,11 +1032,11 @@ static int qt602240_initialize(struct qt602240_data *data)
return 0; return 0;
} }
static ssize_t qt602240_object_show(struct device *dev, static ssize_t mxt_object_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct qt602240_data *data = dev_get_drvdata(dev); struct mxt_data *data = dev_get_drvdata(dev);
struct qt602240_object *object; struct mxt_object *object;
int count = 0; int count = 0;
int i, j; int i, j;
int error; int error;
...@@ -1049,13 +1049,13 @@ static ssize_t qt602240_object_show(struct device *dev, ...@@ -1049,13 +1049,13 @@ static ssize_t qt602240_object_show(struct device *dev,
"Object Table Element %d(Type %d)\n", "Object Table Element %d(Type %d)\n",
i + 1, object->type); i + 1, object->type);
if (!qt602240_object_readable(object->type)) { if (!mxt_object_readable(object->type)) {
count += sprintf(buf + count, "\n"); count += sprintf(buf + count, "\n");
continue; continue;
} }
for (j = 0; j < object->size + 1; j++) { for (j = 0; j < object->size + 1; j++) {
error = qt602240_read_object(data, error = mxt_read_object(data,
object->type, j, &val); object->type, j, &val);
if (error) if (error)
return error; return error;
...@@ -1070,9 +1070,9 @@ static ssize_t qt602240_object_show(struct device *dev, ...@@ -1070,9 +1070,9 @@ static ssize_t qt602240_object_show(struct device *dev,
return count; return count;
} }
static int qt602240_load_fw(struct device *dev, const char *fn) static int mxt_load_fw(struct device *dev, const char *fn)
{ {
struct qt602240_data *data = dev_get_drvdata(dev); struct mxt_data *data = dev_get_drvdata(dev);
struct i2c_client *client = data->client; struct i2c_client *client = data->client;
const struct firmware *fw = NULL; const struct firmware *fw = NULL;
unsigned int frame_size; unsigned int frame_size;
...@@ -1086,26 +1086,26 @@ static int qt602240_load_fw(struct device *dev, const char *fn) ...@@ -1086,26 +1086,26 @@ static int qt602240_load_fw(struct device *dev, const char *fn)
} }
/* Change to the bootloader mode */ /* Change to the bootloader mode */
qt602240_write_object(data, QT602240_GEN_COMMAND, mxt_write_object(data, MXT_GEN_COMMAND,
QT602240_COMMAND_RESET, QT602240_BOOT_VALUE); MXT_COMMAND_RESET, MXT_BOOT_VALUE);
msleep(QT602240_RESET_TIME); msleep(MXT_RESET_TIME);
/* Change to slave address of bootloader */ /* Change to slave address of bootloader */
if (client->addr == QT602240_APP_LOW) if (client->addr == MXT_APP_LOW)
client->addr = QT602240_BOOT_LOW; client->addr = MXT_BOOT_LOW;
else else
client->addr = QT602240_BOOT_HIGH; client->addr = MXT_BOOT_HIGH;
ret = qt602240_check_bootloader(client, QT602240_WAITING_BOOTLOAD_CMD); ret = mxt_check_bootloader(client, MXT_WAITING_BOOTLOAD_CMD);
if (ret) if (ret)
goto out; goto out;
/* Unlock bootloader */ /* Unlock bootloader */
qt602240_unlock_bootloader(client); mxt_unlock_bootloader(client);
while (pos < fw->size) { while (pos < fw->size) {
ret = qt602240_check_bootloader(client, ret = mxt_check_bootloader(client,
QT602240_WAITING_FRAME_DATA); MXT_WAITING_FRAME_DATA);
if (ret) if (ret)
goto out; goto out;
...@@ -1117,10 +1117,10 @@ static int qt602240_load_fw(struct device *dev, const char *fn) ...@@ -1117,10 +1117,10 @@ static int qt602240_load_fw(struct device *dev, const char *fn)
frame_size += 2; frame_size += 2;
/* Write one frame to device */ /* Write one frame to device */
qt602240_fw_write(client, fw->data + pos, frame_size); mxt_fw_write(client, fw->data + pos, frame_size);
ret = qt602240_check_bootloader(client, ret = mxt_check_bootloader(client,
QT602240_FRAME_CRC_PASS); MXT_FRAME_CRC_PASS);
if (ret) if (ret)
goto out; goto out;
...@@ -1133,19 +1133,19 @@ static int qt602240_load_fw(struct device *dev, const char *fn) ...@@ -1133,19 +1133,19 @@ static int qt602240_load_fw(struct device *dev, const char *fn)
release_firmware(fw); release_firmware(fw);
/* Change to slave address of application */ /* Change to slave address of application */
if (client->addr == QT602240_BOOT_LOW) if (client->addr == MXT_BOOT_LOW)
client->addr = QT602240_APP_LOW; client->addr = MXT_APP_LOW;
else else
client->addr = QT602240_APP_HIGH; client->addr = MXT_APP_HIGH;
return ret; return ret;
} }
static ssize_t qt602240_update_fw_store(struct device *dev, static ssize_t mxt_update_fw_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct qt602240_data *data = dev_get_drvdata(dev); struct mxt_data *data = dev_get_drvdata(dev);
unsigned int version; unsigned int version;
int error; int error;
...@@ -1154,14 +1154,14 @@ static ssize_t qt602240_update_fw_store(struct device *dev, ...@@ -1154,14 +1154,14 @@ static ssize_t qt602240_update_fw_store(struct device *dev,
return -EINVAL; return -EINVAL;
} }
if (data->info.version < QT602240_VER_21 || version < QT602240_VER_21) { if (data->info.version < MXT_VER_21 || version < MXT_VER_21) {
dev_err(dev, "FW update supported starting with version 21\n"); dev_err(dev, "FW update supported starting with version 21\n");
return -EINVAL; return -EINVAL;
} }
disable_irq(data->irq); disable_irq(data->irq);
error = qt602240_load_fw(dev, QT602240_FW_NAME); error = mxt_load_fw(dev, MXT_FW_NAME);
if (error) { if (error) {
dev_err(dev, "The firmware update failed(%d)\n", error); dev_err(dev, "The firmware update failed(%d)\n", error);
count = error; count = error;
...@@ -1169,12 +1169,12 @@ static ssize_t qt602240_update_fw_store(struct device *dev, ...@@ -1169,12 +1169,12 @@ static ssize_t qt602240_update_fw_store(struct device *dev,
dev_dbg(dev, "The firmware update succeeded\n"); dev_dbg(dev, "The firmware update succeeded\n");
/* Wait for reset */ /* Wait for reset */
msleep(QT602240_FWRESET_TIME); msleep(MXT_FWRESET_TIME);
kfree(data->object_table); kfree(data->object_table);
data->object_table = NULL; data->object_table = NULL;
qt602240_initialize(data); mxt_initialize(data);
} }
enable_irq(data->irq); enable_irq(data->irq);
...@@ -1182,60 +1182,60 @@ static ssize_t qt602240_update_fw_store(struct device *dev, ...@@ -1182,60 +1182,60 @@ static ssize_t qt602240_update_fw_store(struct device *dev,
return count; return count;
} }
static DEVICE_ATTR(object, 0444, qt602240_object_show, NULL); static DEVICE_ATTR(object, 0444, mxt_object_show, NULL);
static DEVICE_ATTR(update_fw, 0664, NULL, qt602240_update_fw_store); static DEVICE_ATTR(update_fw, 0664, NULL, mxt_update_fw_store);
static struct attribute *qt602240_attrs[] = { static struct attribute *mxt_attrs[] = {
&dev_attr_object.attr, &dev_attr_object.attr,
&dev_attr_update_fw.attr, &dev_attr_update_fw.attr,
NULL NULL
}; };
static const struct attribute_group qt602240_attr_group = { static const struct attribute_group mxt_attr_group = {
.attrs = qt602240_attrs, .attrs = mxt_attrs,
}; };
static void qt602240_start(struct qt602240_data *data) static void mxt_start(struct mxt_data *data)
{ {
/* Touch enable */ /* Touch enable */
qt602240_write_object(data, mxt_write_object(data,
QT602240_TOUCH_MULTI, QT602240_TOUCH_CTRL, 0x83); MXT_TOUCH_MULTI, MXT_TOUCH_CTRL, 0x83);
} }
static void qt602240_stop(struct qt602240_data *data) static void mxt_stop(struct mxt_data *data)
{ {
/* Touch disable */ /* Touch disable */
qt602240_write_object(data, mxt_write_object(data,
QT602240_TOUCH_MULTI, QT602240_TOUCH_CTRL, 0); MXT_TOUCH_MULTI, MXT_TOUCH_CTRL, 0);
} }
static int qt602240_input_open(struct input_dev *dev) static int mxt_input_open(struct input_dev *dev)
{ {
struct qt602240_data *data = input_get_drvdata(dev); struct mxt_data *data = input_get_drvdata(dev);
qt602240_start(data); mxt_start(data);
return 0; return 0;
} }
static void qt602240_input_close(struct input_dev *dev) static void mxt_input_close(struct input_dev *dev)
{ {
struct qt602240_data *data = input_get_drvdata(dev); struct mxt_data *data = input_get_drvdata(dev);
qt602240_stop(data); mxt_stop(data);
} }
static int __devinit qt602240_probe(struct i2c_client *client, static int __devinit mxt_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct qt602240_data *data; struct mxt_data *data;
struct input_dev *input_dev; struct input_dev *input_dev;
int error; int error;
if (!client->dev.platform_data) if (!client->dev.platform_data)
return -EINVAL; return -EINVAL;
data = kzalloc(sizeof(struct qt602240_data), GFP_KERNEL); data = kzalloc(sizeof(struct mxt_data), GFP_KERNEL);
input_dev = input_allocate_device(); input_dev = input_allocate_device();
if (!data || !input_dev) { if (!data || !input_dev) {
dev_err(&client->dev, "Failed to allocate memory\n"); dev_err(&client->dev, "Failed to allocate memory\n");
...@@ -1243,11 +1243,11 @@ static int __devinit qt602240_probe(struct i2c_client *client, ...@@ -1243,11 +1243,11 @@ static int __devinit qt602240_probe(struct i2c_client *client,
goto err_free_mem; goto err_free_mem;
} }
input_dev->name = "AT42QT602240/ATMXT224 Touchscreen"; input_dev->name = "Atmel maXTouch Touchscreen";
input_dev->id.bustype = BUS_I2C; input_dev->id.bustype = BUS_I2C;
input_dev->dev.parent = &client->dev; input_dev->dev.parent = &client->dev;
input_dev->open = qt602240_input_open; input_dev->open = mxt_input_open;
input_dev->close = qt602240_input_close; input_dev->close = mxt_input_close;
__set_bit(EV_ABS, input_dev->evbit); __set_bit(EV_ABS, input_dev->evbit);
__set_bit(EV_KEY, input_dev->evbit); __set_bit(EV_KEY, input_dev->evbit);
...@@ -1255,17 +1255,17 @@ static int __devinit qt602240_probe(struct i2c_client *client, ...@@ -1255,17 +1255,17 @@ static int __devinit qt602240_probe(struct i2c_client *client,
/* For single touch */ /* For single touch */
input_set_abs_params(input_dev, ABS_X, input_set_abs_params(input_dev, ABS_X,
0, QT602240_MAX_XC, 0, 0); 0, MXT_MAX_XC, 0, 0);
input_set_abs_params(input_dev, ABS_Y, input_set_abs_params(input_dev, ABS_Y,
0, QT602240_MAX_YC, 0, 0); 0, MXT_MAX_YC, 0, 0);
/* For multi touch */ /* For multi touch */
input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR, input_set_abs_params(input_dev, ABS_MT_TOUCH_MAJOR,
0, QT602240_MAX_AREA, 0, 0); 0, MXT_MAX_AREA, 0, 0);
input_set_abs_params(input_dev, ABS_MT_POSITION_X, input_set_abs_params(input_dev, ABS_MT_POSITION_X,
0, QT602240_MAX_XC, 0, 0); 0, MXT_MAX_XC, 0, 0);
input_set_abs_params(input_dev, ABS_MT_POSITION_Y, input_set_abs_params(input_dev, ABS_MT_POSITION_Y,
0, QT602240_MAX_YC, 0, 0); 0, MXT_MAX_YC, 0, 0);
input_set_drvdata(input_dev, data); input_set_drvdata(input_dev, data);
...@@ -1276,11 +1276,11 @@ static int __devinit qt602240_probe(struct i2c_client *client, ...@@ -1276,11 +1276,11 @@ static int __devinit qt602240_probe(struct i2c_client *client,
i2c_set_clientdata(client, data); i2c_set_clientdata(client, data);
error = qt602240_initialize(data); error = mxt_initialize(data);
if (error) if (error)
goto err_free_object; goto err_free_object;
error = request_threaded_irq(client->irq, NULL, qt602240_interrupt, error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
IRQF_TRIGGER_FALLING, client->dev.driver->name, data); IRQF_TRIGGER_FALLING, client->dev.driver->name, data);
if (error) { if (error) {
dev_err(&client->dev, "Failed to register interrupt\n"); dev_err(&client->dev, "Failed to register interrupt\n");
...@@ -1291,7 +1291,7 @@ static int __devinit qt602240_probe(struct i2c_client *client, ...@@ -1291,7 +1291,7 @@ static int __devinit qt602240_probe(struct i2c_client *client,
if (error) if (error)
goto err_free_irq; goto err_free_irq;
error = sysfs_create_group(&client->dev.kobj, &qt602240_attr_group); error = sysfs_create_group(&client->dev.kobj, &mxt_attr_group);
if (error) if (error)
goto err_unregister_device; goto err_unregister_device;
...@@ -1310,11 +1310,11 @@ static int __devinit qt602240_probe(struct i2c_client *client, ...@@ -1310,11 +1310,11 @@ static int __devinit qt602240_probe(struct i2c_client *client,
return error; return error;
} }
static int __devexit qt602240_remove(struct i2c_client *client) static int __devexit mxt_remove(struct i2c_client *client)
{ {
struct qt602240_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
sysfs_remove_group(&client->dev.kobj, &qt602240_attr_group); sysfs_remove_group(&client->dev.kobj, &mxt_attr_group);
free_irq(data->irq, data); free_irq(data->irq, data);
input_unregister_device(data->input_dev); input_unregister_device(data->input_dev);
kfree(data->object_table); kfree(data->object_table);
...@@ -1324,83 +1324,84 @@ static int __devexit qt602240_remove(struct i2c_client *client) ...@@ -1324,83 +1324,84 @@ static int __devexit qt602240_remove(struct i2c_client *client)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int qt602240_suspend(struct device *dev) static int mxt_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct qt602240_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
struct input_dev *input_dev = data->input_dev; struct input_dev *input_dev = data->input_dev;
mutex_lock(&input_dev->mutex); mutex_lock(&input_dev->mutex);
if (input_dev->users) if (input_dev->users)
qt602240_stop(data); mxt_stop(data);
mutex_unlock(&input_dev->mutex); mutex_unlock(&input_dev->mutex);
return 0; return 0;
} }
static int qt602240_resume(struct device *dev) static int mxt_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct qt602240_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
struct input_dev *input_dev = data->input_dev; struct input_dev *input_dev = data->input_dev;
/* Soft reset */ /* Soft reset */
qt602240_write_object(data, QT602240_GEN_COMMAND, mxt_write_object(data, MXT_GEN_COMMAND,
QT602240_COMMAND_RESET, 1); MXT_COMMAND_RESET, 1);
msleep(QT602240_RESET_TIME); msleep(MXT_RESET_TIME);
mutex_lock(&input_dev->mutex); mutex_lock(&input_dev->mutex);
if (input_dev->users) if (input_dev->users)
qt602240_start(data); mxt_start(data);
mutex_unlock(&input_dev->mutex); mutex_unlock(&input_dev->mutex);
return 0; return 0;
} }
static const struct dev_pm_ops qt602240_pm_ops = { static const struct dev_pm_ops mxt_pm_ops = {
.suspend = qt602240_suspend, .suspend = mxt_suspend,
.resume = qt602240_resume, .resume = mxt_resume,
}; };
#endif #endif
static const struct i2c_device_id qt602240_id[] = { static const struct i2c_device_id mxt_id[] = {
{ "qt602240_ts", 0 }, { "qt602240_ts", 0 },
{ "atmel_mxt_ts", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, qt602240_id); MODULE_DEVICE_TABLE(i2c, mxt_id);
static struct i2c_driver qt602240_driver = { static struct i2c_driver mxt_driver = {
.driver = { .driver = {
.name = "qt602240_ts", .name = "atmel_mxt_ts",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.pm = &qt602240_pm_ops, .pm = &mxt_pm_ops,
#endif #endif
}, },
.probe = qt602240_probe, .probe = mxt_probe,
.remove = __devexit_p(qt602240_remove), .remove = __devexit_p(mxt_remove),
.id_table = qt602240_id, .id_table = mxt_id,
}; };
static int __init qt602240_init(void) static int __init mxt_init(void)
{ {
return i2c_add_driver(&qt602240_driver); return i2c_add_driver(&mxt_driver);
} }
static void __exit qt602240_exit(void) static void __exit mxt_exit(void)
{ {
i2c_del_driver(&qt602240_driver); i2c_del_driver(&mxt_driver);
} }
module_init(qt602240_init); module_init(mxt_init);
module_exit(qt602240_exit); module_exit(mxt_exit);
/* Module information */ /* Module information */
MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>"); MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
MODULE_DESCRIPTION("AT42QT602240/ATMXT224 Touchscreen driver"); MODULE_DESCRIPTION("Atmel maXTouch Touchscreen driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
include/linux/i2c/atmel_mxt_ts.h
View file @ 7686b108
/* /*
* AT42QT602240/ATMXT224 Touchscreen driver * Atmel maXTouch Touchscreen driver
* *
* Copyright (C) 2010 Samsung Electronics Co.Ltd * Copyright (C) 2010 Samsung Electronics Co.Ltd
* Author: Joonyoung Shim <jy0922.shim@samsung.com> * Author: Joonyoung Shim <jy0922.shim@samsung.com>
...@@ -10,21 +10,21 @@ ...@@ -10,21 +10,21 @@
* option) any later version. * option) any later version.
*/ */
#ifndef __LINUX_QT602240_TS_H #ifndef __LINUX_ATMEL_MXT_TS_H
#define __LINUX_QT602240_TS_H #define __LINUX_ATMEL_MXT_TS_H
/* Orient */ /* Orient */
#define QT602240_NORMAL 0x0 #define MXT_NORMAL 0x0
#define QT602240_DIAGONAL 0x1 #define MXT_DIAGONAL 0x1
#define QT602240_HORIZONTAL_FLIP 0x2 #define MXT_HORIZONTAL_FLIP 0x2
#define QT602240_ROTATED_90_COUNTER 0x3 #define MXT_ROTATED_90_COUNTER 0x3
#define QT602240_VERTICAL_FLIP 0x4 #define MXT_VERTICAL_FLIP 0x4
#define QT602240_ROTATED_90 0x5 #define MXT_ROTATED_90 0x5
#define QT602240_ROTATED_180 0x6 #define MXT_ROTATED_180 0x6
#define QT602240_DIAGONAL_COUNTER 0x7 #define MXT_DIAGONAL_COUNTER 0x7
/* The platform data for the AT42QT602240/ATMXT224 touchscreen driver */ /* The platform data for the Atmel maXTouch touchscreen driver */
struct qt602240_platform_data { struct mxt_platform_data {
unsigned int x_line; unsigned int x_line;
unsigned int y_line; unsigned int y_line;
unsigned int x_size; unsigned int x_size;
...@@ -35,4 +35,4 @@ struct qt602240_platform_data { ...@@ -35,4 +35,4 @@ struct qt602240_platform_data {
unsigned char orient; unsigned char orient;
}; };
#endif /* __LINUX_QT602240_TS_H */ #endif /* __LINUX_ATMEL_MXT_TS_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7