From 6e8d4049ac5886402d3befe59c9a750d99ed0df0 Mon Sep 17 00:00:00 2001
From: "makarand.karvekar" <makarand.karvekar@motorola.com>
Date: Tue, 27 Jul 2010 12:44:27 -0500
Subject: [PATCH] [ARM] tegra: olympus: update touch object elements.

touch object elements updated as per firmware 09
protocol publication.

Change-Id: I1e3ce574859eaa25d8b46add055572ec4017855f
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
---
 arch/arm/mach-tegra/board-olympus-i2c.c | 50 +++++++++++++------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/arch/arm/mach-tegra/board-olympus-i2c.c b/arch/arm/mach-tegra/board-olympus-i2c.c
index 50939e8ec3da..9a56299b8b8c 100644
--- a/arch/arm/mach-tegra/board-olympus-i2c.c
+++ b/arch/arm/mach-tegra/board-olympus-i2c.c
@@ -72,8 +72,8 @@ static struct qtm_touch_keyarray_cfg sholes_key_array_data[] = {
 		.burst_len = 0,
 		.tch_det_thr = 0,
 		.tch_det_int = 0,
-		.rsvd1 = 0,
-		.rsvd2 = 0,
+		.reserve9 = 0,
+		.reserve10 = 0,
 	},
 	{
 		.ctrl = 0,
@@ -85,8 +85,8 @@ static struct qtm_touch_keyarray_cfg sholes_key_array_data[] = {
 		.burst_len = 0,
 		.tch_det_thr = 0,
 		.tch_det_int = 0,
-		.rsvd1 = 0,
-		.rsvd2 = 0,
+		.reserve9 = 0,
+		.reserve10 = 0,
 	},
 };
 
@@ -126,11 +126,11 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 	},
 	.acquire_cfg	= {
 		.charge_time	= 0x06,
-		.atouch_drift	= 0x00,
+		.reserve1	= 0x00,
 		.touch_drift	= 0x0a,
 		.drift_susp	= 0x05,
 		.touch_autocal	= 0x00,
-		.sync		= 0,
+		.reserve5	= 0,
 		.atch_cal_suspend_time	= 0,
 		.atch_cal_suspend_thres	= 0,
 	},
@@ -204,14 +204,14 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 		.trigger_2		= 0,
 		.trigger_3		= 0,
 	},
-	.grip_suppression_cfg = {
+	.grip_face_suppression_cfg = {
 		.ctrl		= 0x00,
 		.xlogrip	= 0x00,
 		.xhigrip	= 0x00,
 		.ylogrip	= 0x00,
 		.yhigrip	= 0x00,
 		.maxtchs	= 0x00,
-		.reserve0	= 0x00,
+		.reserve6	= 0x00,
 		.szthr1		= 0x00,
 		.szthr2		= 0x00,
 		.shpthr1	= 0x00,
@@ -220,20 +220,22 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 	},
 	.noise_suppression_cfg = {
 		.ctrl			= 0,
-		.outlier_filter_len	= 0,
-		.reserve0		= 0,
-		.gcaf_upper_limit	= 0,
-		.gcaf_lower_limit	= 0,
-		.gcaf_low_count		= 0,
-		.noise_threshold	= 0,
 		.reserve1		= 0,
+		.reserve2		= 0,
+		.reserve3		= 0,
+		.reserve4		= 0,
+		.reserve5		= 0,
+		.reserve6		= 0,
+		.reserve7		= 0,
+		.noise_thres		= 0,
+		.reserve9		= 0,
 		.freq_hop_scale		= 0,
 		.burst_freq_0		= 0,
-		.burst_freq_1		= 0,
-		.burst_freq_2		= 0,
-		.burst_freq_3		= 0,
-		.burst_freq_4		= 0,
-		.idle_gcaf_valid	= 0,
+		.burst_freq_1           = 0,
+		.burst_freq_2           = 0,
+		.burst_freq_3           = 0,
+		.burst_freq_4           = 0,
+		.reserve16		= 0,
 	},
 	.touch_proximity_cfg = {
 		.ctrl			= 0,
@@ -241,7 +243,7 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 		.y_origin		= 0,
 		.x_size			= 0,
 		.y_size			= 0,
-		.reserve0		= 0,
+		.reserve5		= 0,
 		.blen			= 0,
 		.tch_thresh		= 0,
 		.tch_detect_int		= 0,
@@ -251,7 +253,7 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 	},
 	.one_touch_gesture_proc_cfg = {
 		.ctrl			= 0,
-		.reserve0		= 0,
+		.num_gestures		= 0,
 		.gesture_enable		= 0,
 		.pres_proc		= 0,
 		.tap_time_out		= 0,
@@ -277,8 +279,8 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 	},
 	.two_touch_gesture_proc_cfg = {
 		.ctrl			= 0,
-		.reserved0		= 0,
-		.reserved1		= 0,
+		.num_gestures		= 0,
+		.reserve2		= 0,
 		.gesture_enable		= 0,
 		.rotate_threshold	= 0,
 		.zoom_threshold		= 0,
@@ -286,7 +288,7 @@ struct qtouch_ts_platform_data olympus_touch_data = {
 	.cte_config_cfg = {
 		.ctrl			= 1,
 		.command		= 0,
-		.mode			= 3,
+		.reserve2		= 3,
 		.idle_gcaf_depth	= 4,
 		.active_gcaf_depth	= 8,
 		.voltage		= 0,
-- 
2.34.1