Modified: trunk/drivers/input/touchscreen/ad7160.c (8995 => 8996)
--- trunk/drivers/input/touchscreen/ad7160.c 2010-07-19 08:35:01 UTC (rev 8995)
+++ trunk/drivers/input/touchscreen/ad7160.c 2010-07-19 13:50:16 UTC (rev 8996)
@@ -19,47 +19,8 @@
#include <linux/input/ad7160.h>
#include "ad7160.h"
-/* H/W registers */
-
-#define AD7160_REG_CHIPID 0x40002024
-#define AD7160_REG_AFE_PWR 0x40050000
-#define AD7160_REG_AFE_CFG1 0x40050004
-#define AD7160_REG_AFE_CFG2 0x40050008
-#define AD7160_REG_AFE_CFG3 0x4005000C
-#define AD7160_REG_AFE_AMB 0x40050018
-#define AD7160_REG_AFE_SLFAVG 0x4005001C
-#define AD7160_REG_AFE_MTLAVG 0x40050020
-#define AD7160_REG_AFE_DEVID 0x40050114
-#define AD7160_REG_AFE_TEST1 0x40050818
-#define AD7160_REG_AFE_TEST2 0x4005081C
-#define AD7160_REG_AFE_GND_OFFS0 0x40051040
-#define AD7160_REG_AFE_GND_CAL_OFFS0 0x400510C0
-
-/* S/W registers */
-
-#define AD7160_REG_DEVICE_ID 0x40051700
-#define AD7160_REG_REV_ID 0x40051704
-#define AD7160_REG_FW_REV 0x40051708
-#define AD7160_REG_XY_RES 0x40051710
-#define AD7160_REG_FINGER_ACT_CTRL 0x40051728
-#define AD7160_REG_FINGER_ACT_STAT 0x40051784
-#define AD7160_REG_GEST_STAT 0x40051788
-#define AD7160_REG_NB_FINGERS 0x4005178C
-#define AD7160_REG_POS_DATA_STATUS1 0x40051790
-#define AD7160_REG_INT_GEST_EN_CTRL 0x4005173C
-
-
-/* Debug registers */
-#define AD7160_REG_STAGE_READ_INDEX 0x40051800
-#define AD7160_REG_STAGE_READ_SLF_CDC 0x40051804
-
#define AD7160_FORCE_CALIBRATION 0x800
#define AD7160_IIR_FILTER_ENABLE 0x2000
-
-#define AD7160_DEMO_CTRL_STAT 0x40051740
-#define AD7160_LPM_CTRL 0x40051714
-#define AD7160_POSITION_WINDOW_CTRL 0x40051750
-
#define AD7160_SIL_ID 0x7160
/*
@@ -318,7 +279,7 @@
ts->tracking_id = 1;
- ad7160_write(ts, AD7160_LPM_CTRL, 0);
+ ad7160_write(ts, AD7160_REG_LPM_CTRL, 0);
ad7160_write(ts, AD7160_REG_INT_GEST_EN_CTRL,
(ts->pdata->ev_code_tap != 0 ? AD7160_TAP_ENABLE : 0) |
(ts->pdata->ev_code_double_tap != 0
@@ -333,10 +294,10 @@
ts->pdata->sensor_x_res);
/* Reset demo control/status register */
- ad7160_write(ts, AD7160_DEMO_CTRL_STAT, AD7160_SW_IIR_FILTER_EN);
+ ad7160_write(ts, AD7160_REG_DEMO_CTRL_STAT, AD7160_SW_IIR_FILTER_EN);
/* Position window update control register */
- ad7160_write(ts, AD7160_POSITION_WINDOW_CTRL,
+ ad7160_write(ts, AD7160_REG_POSITION_WINDOW_CTRL,
(ts->pdata->move_window << 8) |
ts->pdata->first_touch_window);
@@ -350,7 +311,7 @@
mutex_lock(&ts->mutex);
if (!ts->disabled) {
- ad7160_write(ts, AD7160_LPM_CTRL, AD7160_SHUTDOWN);
+ ad7160_write(ts, AD7160_REG_LPM_CTRL, AD7160_SHUTDOWN);
ts->disabled = 1;
disable_irq(ts->bdata.irq);
cancel_work_sync(&ts->work);
Modified: trunk/drivers/input/touchscreen/ad7160.h (8995 => 8996)
--- trunk/drivers/input/touchscreen/ad7160.h 2010-07-19 08:35:01 UTC (rev 8995)
+++ trunk/drivers/input/touchscreen/ad7160.h 2010-07-19 13:50:16 UTC (rev 8996)
@@ -11,6 +11,70 @@
#include <linux/types.h>
+#define AD7160_REG_DEVICE_ID 0x40051700
+#define AD7160_REG_REV_ID 0x40051704
+#define AD7160_REG_FW_REV 0x40051708
+#define AD7160_REG_FP_AFE_AMB 0x4005170C
+#define AD7160_REG_LP_AFE_AMB 0x40051710
+#define AD7160_REG_DMA_RAM_ADDR_CTRL 0x40051714
+#define AD7160_REG_DMA_CTRL 0x40051718
+#define AD7160_REG_AFE_DAC_OFFS_CTRL 0x4005171C
+#define AD7160_REG_LPM_CTRL 0x40051720
+#define AD7160_REG_BOOT_MODE_CTRL 0x40051744
+#define AD7160_REG_FINGER_ACT_CTRL 0x40051738
+#define AD7160_REG_XY_NB_SENSORS 0x4005173C
+#define AD7160_REG_XY_RES 0x40051740
+#define AD7160_REG_POSITION_WINDOW_CTRL 0x40051744
+#define AD7160_REG_INT_GEST_EN_CTRL 0x4005175C
+#define AD7160_REG_HORZ_VERT_GEST_CTRL 0x40051760
+#define AD7160_REG_PINCH_CTRL 0x40051764
+#define AD7160_REG_ROT_CTRL 0x40051768
+#define AD7160_REG_HAPTIC_CTRL 0x40051780
+#define AD7160_REG_HAPTIC_EFFECT1_CTRL 0x40051784
+#define AD7160_REG_HAPTIC_EFFECT2_CTRL 0x40051788
+#define AD7160_REG_HAPTIC_EFFECT3_CTRL1 0x4005178C
+#define AD7160_REG_HAPTIC_EFFECT3_CTRL2 0x40051790
+#define AD7160_REG_HAPTIC_EFFECT4_CTRL1 0x40051794
+#define AD7160_REG_HAPTIC_EFFECT4_CTRL2 0x40051798
+#define AD7160_REG_HAPTIC_EFFECT5_CTRL1 0x4005179C
+#define AD7160_REG_HAPTIC_EFFECT5_CTRL2 0x400517A0
+#define AD7160_REG_HAPTIC_EFFECT5_CTRL3 0x400517A4
+#define AD7160_REG_HAPTIC_EFFECT6_CTRL1 0x400517A8
+#define AD7160_REG_HAPTIC_EFFECT6_CTRL2 0x400517AC
+#define AD7160_REG_HAPTIC_EFFECT6_CTRL3 0x400517B0
+#define AD7160_REG_AFE_OFFS_ADJ_STAT 0x400517DC
+#define AD7160_REG_PRESSURE_STAT 0x400517E0
+#define AD7160_REG_FINGER_ACT_STAT 0x400517E4
+#define AD7160_REG_GEST_STAT 0x400517E8
+#define AD7160_REG_NB_FINGERS 0x400517EC
+#define AD7160_REG_POS_DATA_STATUS1 0x400517F0
+#define AD7160_REG_ABS_MT_TOUCH_STATUS1 0x400517F4
+#define AD7160_REG_POS_DATA_STATUS2 0x400517F8
+#define AD7160_REG_ABS_MT_TOUCH_STATUS2 0x400517FC
+#define AD7160_REG_POS_DATA_STATUS3 0x40051800
+#define AD7160_REG_ABS_MT_TOUCH_STATUS3 0x40051804
+#define AD7160_REG_POS_DATA_STATUS4 0x40051808
+#define AD7160_REG_ABS_MT_TOUCH_STATUS4 0x4005180C
+#define AD7160_REG_POS_DATA_STATUS5 0x40051810
+#define AD7160_REG_ABS_MT_TOUCH_STATUS5 0x40051814
+#define AD7160_REG_POS_DATA_STATUS6 0x40051818
+#define AD7160_REG_ABS_MT_TOUCH_STATUS6 0x4005181C
+#define AD7160_REG_POS_DATA_STATUS7 0x40051820
+#define AD7160_REG_ABS_MT_TOUCH_STATUS7 0x40051824
+#define AD7160_REG_POS_DATA_STATUS8 0x40051828
+#define AD7160_REG_ABS_MT_TOUCH_STATUS8 0x4005182C
+#define AD7160_REG_POS_DATA_STATUS9 0x40051830
+#define AD7160_REG_ABS_MT_TOUCH_STATUS9 0x40051834
+#define AD7160_REG_POS_DATA_STATUS10 0x40051838
+#define AD7160_REG_ABS_MT_TOUCH_STATUS10 0x4005183C
+#define AD7160_REG_STAGE_READ_INDEX 0x40051868
+#define AD7160_REG_STAGE_READ_SLF_CDC 0x4005186C
+#define AD7160_REG_STAGE_READ_SLF_AMB 0x40051870
+#define AD7160_REG_STAGE_READ_SLF_OFFS 0x40051874
+#define AD7160_REG_STAGE_READ_HSTAT 0x40051878
+#define AD7160_REG_STAGE_READ_PROX 0x4005187C
+#define AD7160_REG_DEMO_CTRL_STAT 0x400517B4
+
#define REG_SIZE_BYTES 4
#define MAX_NUM_FINGERS 10
#define MAX_DATA_CNT (MAX_NUM_FINGERS * 2)
