[ARM] tegra: stingray: update touch object elements.

touch object elements updated as per firmware 09
protocol publication.

Change-Id: I8fceb69b42b3234953dfd7aa35f01ead3f300ff6
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>

diff --git a/arch/arm/mach-tegra/board-stingray-touch.c b/arch/arm/mach-tegra/board-stingray-touch.c
index ab20d821a58a8a4a3fefafa79a01ef8e677e5247..49dec9f033acb8dfe1654da2594fadbeec806ffd 100644 (file)
--- a/arch/arm/mach-tegra/board-stingray-touch.c
+++ b/arch/arm/mach-tegra/board-stingray-touch.c
@@ -89,13 +89,15 @@ struct qtouch_ts_platform_data stingray_touch_data_m1 = {
        },
        .acquire_cfg    = {
                .charge_time    = 0x0A,
-               .atouch_drift   = 0x14,
+               .reserve1       = 0,
                .touch_drift    = 0x14,
                .drift_susp     = 0x14,
                .touch_autocal  = 0x00,
-               .sync           = 0,
+               .reserve5       = 0,
                .atch_cal_suspend_time  = 0,
                .atch_cal_suspend_thres = 0,
+               .atch_cal_force_thres = 0x10,
+               .atch_cal_force_ratio = 0,
        },
        .multi_touch_cfg        = {
                .ctrl           = 0x83,
@@ -104,8 +106,8 @@ struct qtouch_ts_platform_data stingray_touch_data_m1 = {
                .x_size         = 0x1b,
                .y_size         = 0x2a,
                .aks_cfg        = 0,
-               .burst_len      = 0x30,
-               .tch_det_thr    = 0x37,
+               .burst_len      = 0x10,
+               .tch_det_thr    = 45,
                .tch_det_int    = 0x3,
                .orient         = 7,
                .mrg_to         = 0x00,
@@ -128,93 +130,32 @@ struct qtouch_ts_platform_data stingray_touch_data_m1 = {
                .y_edge_dist    = 0,
                .jump_limit     = 0,
        },
-       .linear_tbl_cfg = {
-               .ctrl           = 0x00,
-               .x_offset       = 0x0000,
-               .x_segment = {
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-               },
-               .y_offset = 0x0000,
-               .y_segment = {
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-               },
-       },
        .comms_config_cfg = {
                .ctrl           = 0,
                .command        = 0,
        },
-       .gpio_pwm_cfg = {
-               .ctrl                   = 0,
-               .report_mask            = 0,
-               .pin_direction          = 0,
-               .internal_pullup        = 0,
-               .output_value           = 0,
-               .wake_on_change         = 0,
-               .pwm_enable             = 0,
-               .pwm_period             = 0,
-               .duty_cycle_0           = 0,
-               .duty_cycle_1           = 0,
-               .duty_cycle_2           = 0,
-               .duty_cycle_3           = 0,
-               .trigger_0              = 0,
-               .trigger_1              = 0,
-               .trigger_2              = 0,
-               .trigger_3              = 0,
-       },
-       .grip_suppression_cfg = {
-               .ctrl           = 0x00,
-               .xlogrip        = 0x2F,
-               .xhigrip        = 0x2F,
-               .ylogrip        = 0x2F,
-               .yhigrip        = 0x2F,
-               .maxtchs        = 0x00,
-               .reserve0       = 0x00,
-               .szthr1         = 0x00,
-               .szthr2         = 0x00,
-               .shpthr1        = 0x00,
-               .shpthr2        = 0x00,
-               .supextto       = 0x00,
-       },
        .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           = 0x0A,
-               .burst_freq_2           = 0x0F,
-               .burst_freq_3           = 0x14,
-               .burst_freq_4           = 0x19,
-               .idle_gcaf_valid        = 0,
-       },
-       .touch_proximity_cfg = {
-               .ctrl                   = 0,
-               .x_origin               = 0,
-               .y_origin               = 0,
-               .x_size                 = 0,
-               .y_size                 = 0,
-               .reserve0               = 0,
-               .blen                   = 0,
-               .tch_thresh             = 0,
-               .tch_detect_int         = 0,
-               .average                = 0,
-               .move_null_rate         = 0,
-               .move_det_tresh         = 0,
-       },
+               .burst_freq_0           = 0,
+               .burst_freq_1           = 0,
+               .burst_freq_2           = 0,
+               .burst_freq_3           = 0,
+               .burst_freq_4           = 0,
+               .reserve16              = 0,
+        },
        .one_touch_gesture_proc_cfg = {
                .ctrl                   = 0,
-               .reserve0               = 0,
+               .num_gestures           = 0,
                .gesture_enable         = 0,
                .pres_proc              = 0,
                .tap_time_out           = 0,
@@ -240,8 +181,8 @@ struct qtouch_ts_platform_data stingray_touch_data_m1 = {
        },
        .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,
@@ -249,51 +190,33 @@ struct qtouch_ts_platform_data stingray_touch_data_m1 = {
        .cte_config_cfg = {
                .ctrl                   = 0,
                .command                = 0,
-               .mode                   = 0,
+               .reserve2               = 0,
                .idle_gcaf_depth        = 16,
                .active_gcaf_depth      = 16,
                .voltage                = 60,
        },
-       .noise1_suppression_cfg = {
-               .ctrl           = 0x01,
-               .version        = 0x01,
-               .atch_thr       = 0x64,
-               .duty_cycle     = 0x08,
-               .drift_thr      = 0x00,
-               .clamp_thr      = 0x00,
-               .diff_thr       = 0x00,
-               .adjustment     = 0x00,
-               .average        = 0x0000,
-               .temp           = 0x00,
-               .offset = {
-                       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, 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, 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, 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,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-               },
-               .bad_chan = {
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00
-               },
-               .x_short        = 0x00,
+       .gripsuppression_t40_cfg = {
+               .ctrl                   = 0,
+               .xlo_grip               = 0,
+               .xhi_grip               = 0,
+               .ylo_grip               = 0,
+               .yhi_grip               = 0,
        },
+       .palm_suppression_cfg = {
+               .ctrl                   = 0,
+               .small_obj_thr          = 0,
+               .sig_spread_thr         = 0,
+               .large_obj_thr          = 0,
+               .distance_thr           = 0,
+               .sup_ext_to             = 0,
+       },
+       .spt_digitizer_cfg = {
+               .ctrl                   = 0,
+               .hid_idlerate           = 0,
+               .xlength                = 0,
+               .ylength                = 0,
+       },
+
        .vkeys                  = {
                .count          = 0,
                .keys           = NULL,
@@ -316,7 +239,7 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
        .abs_max_w              = 15,
        .x_delta                = 400,
        .y_delta                = 250,
-       .nv_checksum            = 0x2c30,
+       .nv_checksum            = 0x6462cb,
        .fuzz_x                 = 0,
        .fuzz_y                 = 0,
        .fuzz_p                 = 2,
@@ -329,10 +252,10 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
                .num_keys       = 0,
        },
        .touch_fw_cfg = {
-               .fw_name = "mXT1386_08_AA.bin",
+               .fw_name = "mXT1386_09_AA.bin",
                .family_id = 0xA0,
                .variant_id = 0x00,
-               .fw_version = 0x08,
+               .fw_version = 0x09,
                .fw_build = 0xAA,
                .boot_version = 0x20,
                .base_fw_version = 0x00,
@@ -344,13 +267,15 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
        },
        .acquire_cfg    = {
                .charge_time    = 0x0A,
-               .atouch_drift   = 0x14,
+               .reserve1       = 0,
                .touch_drift    = 0x14,
                .drift_susp     = 0x14,
                .touch_autocal  = 0x00,
-               .sync           = 0,
+               .reserve5       = 0,
                .atch_cal_suspend_time  = 0,
                .atch_cal_suspend_thres = 0,
+               .atch_cal_force_thres = 0x10,
+               .atch_cal_force_ratio = 0,
        },
        .multi_touch_cfg        = {
                .ctrl           = 0x83,
@@ -359,8 +284,8 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
                .x_size         = 0x21,
                .y_size         = 0x2a,
                .aks_cfg        = 0,
-               .burst_len      = 0x20,
-               .tch_det_thr    = 0x2d,
+               .burst_len      = 0x10,
+               .tch_det_thr    = 45,
                .tch_det_int    = 0x3,
                .orient         = 1,
                .mrg_to         = 0x00,
@@ -377,99 +302,41 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
                .x_high_clip    = 0x00,
                .y_low_clip     = 0x00,
                .y_high_clip    = 0x00,
-               .x_edge_ctrl    = 0,
+               .x_edge_ctrl    = 0,
                .x_edge_dist    = 0,
-               .y_edge_ctrl    = 0,
+               .y_edge_ctrl    = 0,
                .y_edge_dist    = 0,
                .jump_limit     = 0,
-       },
-       .linear_tbl_cfg = {
-               .ctrl           = 0x00,
-               .x_offset       = 0x0000,
-               .x_segment = {
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-               },
-               .y_offset = 0x0000,
-               .y_segment = {
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-               },
-       },
+               .tch_thres_hyst = 0x09,
+               .xpitch         = 0,
+               .ypitch         = 0,
+        },
        .comms_config_cfg = {
                .ctrl           = 0,
                .command        = 0,
        },
-       .gpio_pwm_cfg = {
-               .ctrl                   = 0,
-               .report_mask            = 0,
-               .pin_direction          = 0,
-               .internal_pullup        = 0,
-               .output_value           = 0,
-               .wake_on_change         = 0,
-               .pwm_enable             = 0,
-               .pwm_period             = 0,
-               .duty_cycle_0           = 0,
-               .duty_cycle_1           = 0,
-               .duty_cycle_2           = 0,
-               .duty_cycle_3           = 0,
-               .trigger_0              = 0,
-               .trigger_1              = 0,
-               .trigger_2              = 0,
-               .trigger_3              = 0,
-       },
-       .grip_suppression_cfg = {
-               .ctrl           = 0x00,
-               .xlogrip        = 0x2F,
-               .xhigrip        = 0x2F,
-               .ylogrip        = 0x2F,
-               .yhigrip        = 0x2F,
-               .maxtchs        = 0x00,
-               .reserve0       = 0x00,
-               .szthr1         = 0x00,
-               .szthr2         = 0x00,
-               .shpthr1        = 0x00,
-               .shpthr2        = 0x00,
-               .supextto       = 0x00,
-       },
        .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           = 0x0A,
-               .burst_freq_2           = 0x0F,
-               .burst_freq_3           = 0x14,
-               .burst_freq_4           = 0x19,
-               .idle_gcaf_valid        = 0,
-       },
-       .touch_proximity_cfg = {
-               .ctrl                   = 0,
-               .x_origin               = 0,
-               .y_origin               = 0,
-               .x_size                 = 0,
-               .y_size                 = 0,
-               .reserve0               = 0,
-               .blen                   = 0,
-               .tch_thresh             = 0,
-               .tch_detect_int         = 0,
-               .average                = 0,
-               .move_null_rate         = 0,
-               .move_det_tresh         = 0,
+               .burst_freq_1           = 0,
+               .burst_freq_2           = 0,
+               .burst_freq_3           = 0,
+               .burst_freq_4           = 0,
+               .reserve16              = 0,
        },
        .one_touch_gesture_proc_cfg = {
                .ctrl                   = 0,
-               .reserve0               = 0,
+               .num_gestures           = 0,
                .gesture_enable         = 0,
                .pres_proc              = 0,
                .tap_time_out           = 0,
@@ -495,8 +362,8 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
        },
        .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,
@@ -504,55 +371,37 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = {
        .cte_config_cfg = {
                .ctrl                   = 0,
                .command                = 0,
-               .mode                   = 0,
+                .reserve2              = 0,
                .idle_gcaf_depth        = 16,
                .active_gcaf_depth      = 16,
                .voltage                = 60,
        },
-       .noise1_suppression_cfg = {
-               .ctrl           = 0x01,
-               .version        = 0x01,
-               .atch_thr       = 0x64,
-               .duty_cycle     = 0x08,
-               .drift_thr      = 0x00,
-               .clamp_thr      = 0x00,
-               .diff_thr       = 0x00,
-               .adjustment     = 0x00,
-               .average        = 0x0000,
-               .temp           = 0x00,
-               .offset = {
-                       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, 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, 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, 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,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-               },
-               .bad_chan = {
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00
-               },
-               .x_short        = 0x00,
+       .gripsuppression_t40_cfg = {
+               .ctrl                   = 0,
+               .xlo_grip               = 0,
+               .xhi_grip               = 0,
+               .ylo_grip               = 0,
+               .yhi_grip               = 0,
        },
-       .vkeys                  = {
-               .count          = 0,
-               .keys           = NULL,
+       .palm_suppression_cfg = {
+               .ctrl                   = 0,
+               .small_obj_thr          = 0,
+               .sig_spread_thr         = 0,
+               .large_obj_thr          = 0,
+               .distance_thr           = 0,
+               .sup_ext_to             = 0,
        },
+       .spt_digitizer_cfg = {
+               .ctrl                   = 0,
+               .hid_idlerate           = 0,
+               .xlength                = 0,
+               .ylength                = 0,
+       },
+
+       .vkeys                  = {
+                .count          = 0,
+                .keys           = NULL,
+        },
 };
 
 /* Portable P1 and P2 */
@@ -571,7 +420,7 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
        .abs_max_w              = 15,
        .x_delta                = 400,
        .y_delta                = 250,
-       .nv_checksum            = 0x2c30,
+       .nv_checksum            = 0x6462cb,
        .fuzz_x                 = 0,
        .fuzz_y                 = 0,
        .fuzz_p                 = 2,
@@ -584,10 +433,10 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
                .num_keys       = 0,
        },
        .touch_fw_cfg = {
-               .fw_name = "mXT1386_08_AA.bin",
+               .fw_name = "mXT1386_09_AA.bin",
                .family_id = 0xA0,
                .variant_id = 0x00,
-               .fw_version = 0x08,
+               .fw_version = 0x09,
                .fw_build = 0xAA,
                .boot_version = 0x20,
                .base_fw_version = 0x00,
@@ -599,13 +448,15 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
        },
        .acquire_cfg    = {
                .charge_time    = 0x0A,
-               .atouch_drift   = 0x14,
+               .reserve1       = 0,
                .touch_drift    = 0x14,
                .drift_susp     = 0x14,
                .touch_autocal  = 0x00,
-               .sync           = 0,
+               .reserve5       = 0,
                .atch_cal_suspend_time  = 0,
                .atch_cal_suspend_thres = 0,
+               .atch_cal_force_thres = 0x10,
+               .atch_cal_force_ratio = 0,
        },
        .multi_touch_cfg        = {
                .ctrl           = 0x83,
@@ -614,8 +465,8 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
                .x_size         = 0x21,
                .y_size         = 0x2a,
                .aks_cfg        = 0,
-               .burst_len      = 0x20,
-               .tch_det_thr    = 0x2d,
+               .burst_len      = 0x10,
+               .tch_det_thr    = 45,
                .tch_det_int    = 0x3,
                .orient         = 1,
                .mrg_to         = 0x00,
@@ -632,99 +483,41 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
                .x_high_clip    = 0x00,
                .y_low_clip     = 0x00,
                .y_high_clip    = 0x00,
-               .x_edge_ctrl    = 0,
+               .x_edge_ctrl    = 0,
                .x_edge_dist    = 0,
-               .y_edge_ctrl    = 0,
+               .y_edge_ctrl    = 0,
                .y_edge_dist    = 0,
                .jump_limit     = 0,
-       },
-       .linear_tbl_cfg = {
-               .ctrl           = 0x00,
-               .x_offset       = 0x0000,
-               .x_segment = {
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-               },
-               .y_offset = 0x0000,
-               .y_segment = {
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00
-               },
-       },
+               .tch_thres_hyst = 0x09,
+               .xpitch         = 0,
+               .ypitch         = 0,
+        },
        .comms_config_cfg = {
                .ctrl           = 0,
                .command        = 0,
        },
-       .gpio_pwm_cfg = {
-               .ctrl                   = 0,
-               .report_mask            = 0,
-               .pin_direction          = 0,
-               .internal_pullup        = 0,
-               .output_value           = 0,
-               .wake_on_change         = 0,
-               .pwm_enable             = 0,
-               .pwm_period             = 0,
-               .duty_cycle_0           = 0,
-               .duty_cycle_1           = 0,
-               .duty_cycle_2           = 0,
-               .duty_cycle_3           = 0,
-               .trigger_0              = 0,
-               .trigger_1              = 0,
-               .trigger_2              = 0,
-               .trigger_3              = 0,
-       },
-       .grip_suppression_cfg = {
-               .ctrl           = 0x00,
-               .xlogrip        = 0x2F,
-               .xhigrip        = 0x2F,
-               .ylogrip        = 0x2F,
-               .yhigrip        = 0x2F,
-               .maxtchs        = 0x00,
-               .reserve0       = 0x00,
-               .szthr1         = 0x00,
-               .szthr2         = 0x00,
-               .shpthr1        = 0x00,
-               .shpthr2        = 0x00,
-               .supextto       = 0x00,
-       },
        .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           = 0x0A,
-               .burst_freq_2           = 0x0F,
-               .burst_freq_3           = 0x14,
-               .burst_freq_4           = 0x19,
-               .idle_gcaf_valid        = 0,
-       },
-       .touch_proximity_cfg = {
-               .ctrl                   = 0,
-               .x_origin               = 0,
-               .y_origin               = 0,
-               .x_size                 = 0,
-               .y_size                 = 0,
-               .reserve0               = 0,
-               .blen                   = 0,
-               .tch_thresh             = 0,
-               .tch_detect_int         = 0,
-               .average                = 0,
-               .move_null_rate         = 0,
-               .move_det_tresh         = 0,
+               .burst_freq_1           = 0,
+               .burst_freq_2           = 0,
+               .burst_freq_3           = 0,
+               .burst_freq_4           = 0,
+               .reserve16              = 0,
        },
        .one_touch_gesture_proc_cfg = {
                .ctrl                   = 0,
-               .reserve0               = 0,
+               .num_gestures           = 0,
                .gesture_enable         = 0,
                .pres_proc              = 0,
                .tap_time_out           = 0,
@@ -750,8 +543,8 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
        },
        .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,
@@ -759,51 +552,33 @@ struct qtouch_ts_platform_data stingray_touch_data_p1p2 = {
        .cte_config_cfg = {
                .ctrl                   = 0,
                .command                = 0,
-               .mode                   = 0,
+               .reserve2               = 0,
                .idle_gcaf_depth        = 16,
                .active_gcaf_depth      = 16,
                .voltage                = 60,
        },
-       .noise1_suppression_cfg = {
-               .ctrl           = 0x01,
-               .version        = 0x01,
-               .atch_thr       = 0x64,
-               .duty_cycle     = 0x08,
-               .drift_thr      = 0x00,
-               .clamp_thr      = 0x00,
-               .diff_thr       = 0x00,
-               .adjustment     = 0x00,
-               .average        = 0x0000,
-               .temp           = 0x00,
-               .offset = {
-                       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, 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, 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, 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,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-               },
-               .bad_chan = {
-                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                       0x00, 0x00, 0x00
+       .gripsuppression_t40_cfg = {
+               .ctrl                   = 0,
+               .xlo_grip               = 0,
+               .xhi_grip               = 0,
+               .ylo_grip               = 0,
+               .yhi_grip               = 0,
                },
-               .x_short        = 0x00,
+       .palm_suppression_cfg = {
+               .ctrl                   = 0,
+               .small_obj_thr          = 0,
+               .sig_spread_thr         = 0,
+               .large_obj_thr          = 0,
+               .distance_thr           = 0,
+               .sup_ext_to             = 0,
        },
+       .spt_digitizer_cfg = {
+               .ctrl                   = 0,
+               .hid_idlerate           = 0,
+               .xlength                = 0,
+               .ylength                = 0,
+       },
+
        .vkeys                  = {
                .count          = 0,
                .keys           = NULL,