Title: [9188] trunk/drivers/input/touchscreen: [#6066] input: touchscreen: Update AD7160 register definition to spec rev.
- Revision
- 9188
- Author
- hennerich
- Date
- 2010-10-01 09:01:48 -0400 (Fri, 01 Oct 2010)
Log Message
[#6066] input: touchscreen: Update AD7160 register definition to spec rev. 9.00
Modified Paths
Diff
Modified: trunk/drivers/input/touchscreen/ad7160.c (9187 => 9188)
--- trunk/drivers/input/touchscreen/ad7160.c 2010-09-30 08:26:50 UTC (rev 9187)
+++ trunk/drivers/input/touchscreen/ad7160.c 2010-10-01 13:01:48 UTC (rev 9188)
@@ -378,9 +378,6 @@
(ts->pdata->sensor_y_res << 12) |
ts->pdata->sensor_x_res);
- /* Reset demo control/status register */
- ad7160_write(ts, AD7160_REG_DEMO_CTRL_STAT, AD7160_SW_IIR_FILTER_EN);
-
/* Position window update control register */
ad7160_write(ts, AD7160_REG_POSITION_WINDOW_CTRL,
(ts->pdata->move_window << 8) |
Modified: trunk/drivers/input/touchscreen/ad7160.h (9187 => 9188)
--- trunk/drivers/input/touchscreen/ad7160.h 2010-09-30 08:26:50 UTC (rev 9187)
+++ trunk/drivers/input/touchscreen/ad7160.h 2010-10-01 13:01:48 UTC (rev 9188)
@@ -12,69 +12,62 @@
#include <linux/types.h>
#define AD7160_REG_AFE_DEVID 0x40050114
-#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 0x40051724
-#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 AD7160_REG_DEVICE_ID 0x40051E80
+#define AD7160_REG_REV_ID 0x40051E84
+#define AD7160_REG_FW_REV 0x40051E88
+#define AD7160_REG_FP_BASELINE_CTRL 0x40051E8C
+#define AD7160_REG_LP_BASELINE_CTRL 0x40051E90
+#define AD7160_REG_DMA_RAM_ADDR_CTRL 0x40051E94
+#define AD7160_REG_DMA_CTRL 0x40051E98
+#define AD7160_REG_AFE_DAC_OFFS_CTRL 0x40051E9C
+#define AD7160_REG_LPM_CTRL 0x40051EA0
+#define AD7160_REG_BOOT_MODE_CTRL 0x40051EA4
+#define AD7160_REG_FINGER_ACT_CTRL 0x40051EB8
+#define AD7160_REG_XY_NB_SENSORS 0x40051EBC
+#define AD7160_REG_XY_RES 0x40051EC0
+#define AD7160_REG_POSITION_WINDOW_CTRL 0x40051EC4
+#define AD7160_REG_FINGER_SEPARATION_CTRL 0x40051EC8
+#define AD7160_REG_INT_GEST_EN_CTRL 0x40051EDC
+#define AD7160_REG_HORZ_VERT_GEST_CTRL 0x40051EE0
+#define AD7160_REG_PINCH_CTRL 0x40051EE4
+#define AD7160_REG_ROT_CTRL 0x40051EE8
+#define AD7160_REG_HAPTIC_CTRL 0x40051F00
+#define AD7160_REG_HAPTIC_EFFECT1_CTRL 0x40051F04
+#define AD7160_REG_HAPTIC_EFFECT2_CTRL 0x40051F08
+#define AD7160_REG_HAPTIC_EFFECT3_CTRL1 0x40051F0C
+#define AD7160_REG_HAPTIC_EFFECT3_CTRL2 0x40051F10
+#define AD7160_REG_HAPTIC_EFFECT4_CTRL1 0x40051F14
+#define AD7160_REG_HAPTIC_EFFECT4_CTRL2 0x40051F18
+#define AD7160_REG_HAPTIC_EFFECT5_CTRL1 0x40051F1C
+#define AD7160_REG_HAPTIC_EFFECT5_CTRL2 0x40051F20
+#define AD7160_REG_HAPTIC_EFFECT5_CTRL3 0x40051F24
+#define AD7160_REG_HAPTIC_EFFECT6_CTRL1 0x40051F28
+#define AD7160_REG_HAPTIC_EFFECT6_CTRL2 0x40051F2C
+#define AD7160_REG_HAPTIC_EFFECT6_CTRL3 0x40051F30
+#define AD7160_REG_AFE_OFFS_ADJ_STAT 0x40051F5C
+#define AD7160_REG_FINGER_ACT_STAT 0x40051F64
+#define AD7160_REG_GEST_STAT 0x40051F68
+#define AD7160_REG_NB_FINGERS 0x40051F6C
+#define AD7160_REG_POS_DATA_STATUS1 0x40051F70
+#define AD7160_REG_ABS_MT_TOUCH_STATUS1 0x40051F74
+#define AD7160_REG_POS_DATA_STATUS2 0x40051F78
+#define AD7160_REG_ABS_MT_TOUCH_STATUS2 0x40051F7C
+#define AD7160_REG_POS_DATA_STATUS3 0x40051F80
+#define AD7160_REG_ABS_MT_TOUCH_STATUS3 0x40051F84
+#define AD7160_REG_POS_DATA_STATUS4 0x40051F88
+#define AD7160_REG_ABS_MT_TOUCH_STATUS4 0x40051F8C
+#define AD7160_REG_POS_DATA_STATUS5 0x40051F90
+#define AD7160_REG_ABS_MT_TOUCH_STATUS5 0x40051F94
+#define AD7160_REG_POS_DATA_STATUS6 0x40051F98
+#define AD7160_REG_ABS_MT_TOUCH_STATUS6 0x40051F9C
+#define AD7160_REG_POS_DATA_STATUS7 0x40051FA0
+#define AD7160_REG_ABS_MT_TOUCH_STATUS7 0x40051FA4
+#define AD7160_REG_POS_DATA_STATUS8 0x40051FA8
+#define AD7160_REG_ABS_MT_TOUCH_STATUS8 0x40051FAC
+#define AD7160_REG_POS_DATA_STATUS9 0x40051FB0
+#define AD7160_REG_ABS_MT_TOUCH_STATUS9 0x40051FB4
+#define AD7160_REG_POS_DATA_STATUS10 0x40051FB8
+#define AD7160_REG_ABS_MT_TOUCH_STATUS10 0x40051FBC
#define REG_SIZE_BYTES 4
#define MAX_NUM_FINGERS 10
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
