From 77105edfe2a344c81fca23a23226eb3b4db8b7b2 Mon Sep 17 00:00:00 2001 From: Rebecca Schultz Zavin Date: Wed, 13 Oct 2010 14:09:46 -0700 Subject: [PATCH] Revert "[ARM]: tegra: tuning for touch-panel in stingray board file" This reverts commit ae4691e0a9a79c158feb755ca0b32d7693bc0f54. --- arch/arm/mach-tegra/board-stingray-touch.c | 96 +++++++++++----------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/arch/arm/mach-tegra/board-stingray-touch.c b/arch/arm/mach-tegra/board-stingray-touch.c index 5c5926072919..e43a66d9902d 100644 --- a/arch/arm/mach-tegra/board-stingray-touch.c +++ b/arch/arm/mach-tegra/board-stingray-touch.c @@ -241,7 +241,7 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = { .abs_max_w = 15, .x_delta = 400, .y_delta = 250, - .nv_checksum = 0x0ee972, + .nv_checksum = 0x99469a, .fuzz_x = 0, .fuzz_y = 0, .fuzz_p = 2, @@ -263,9 +263,9 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = { .base_fw_version = 0x00, }, .power_cfg = { - .idle_acq_int = 0x12, - .active_acq_int = 0x12, - .active_idle_to = 0x19, + .idle_acq_int = 0xff, + .active_acq_int = 0xff, + .active_idle_to = 0x00, }, .acquire_cfg = { .charge_time = 0x0A, @@ -286,28 +286,28 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = { .x_size = 0x21, .y_size = 0x2a, .aks_cfg = 0, - .burst_len = 0x20, - .tch_det_thr = 0x23, - .tch_det_int = 0x2, + .burst_len = 0x10, + .tch_det_thr = 45, + .tch_det_int = 0x3, .orient = 1, .mrg_to = 0x00, - .mov_hyst_init = 0x32, - .mov_hyst_next = 0x14, - .mov_filter = 0x42, + .mov_hyst_init = 0x05, + .mov_hyst_next = 0x02, + .mov_filter = 0x20, .num_touch = 0x05, .merge_hyst = 0x0A, .merge_thresh = 0x0A, .amp_hyst = 0x0A, .x_res = 0x0FFF, .y_res = 0x0FFF, - .x_low_clip = 0x06, - .x_high_clip = 0x0A, - .y_low_clip = 0x05, - .y_high_clip = 0xFF, - .x_edge_ctrl = 0xCC, - .x_edge_dist = 0x25, - .y_edge_ctrl = 0xDC, - .y_edge_dist = 0x0A, + .x_low_clip = 0x00, + .x_high_clip = 0x00, + .y_low_clip = 0x00, + .y_high_clip = 0x00, + .x_edge_ctrl = 0, + .x_edge_dist = 0, + .y_edge_ctrl = 0, + .y_edge_dist = 0, .jump_limit = 0, .tch_thres_hyst = 0x09, .xpitch = 0, @@ -374,8 +374,8 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = { .ctrl = 0, .command = 0, .reserve2 = 0, - .idle_gcaf_depth = 20, - .active_gcaf_depth = 20, + .idle_gcaf_depth = 16, + .active_gcaf_depth = 16, .voltage = 60, }, .gripsuppression_t40_cfg = { @@ -386,12 +386,12 @@ struct qtouch_ts_platform_data stingray_touch_data_p0 = { .yhi_grip = 0, }, .palm_suppression_cfg = { - .ctrl = 0x1, + .ctrl = 0, .small_obj_thr = 0, .sig_spread_thr = 0, - .large_obj_thr = 0x24, - .distance_thr = 0x5, - .sup_ext_to = 0x5, + .large_obj_thr = 0, + .distance_thr = 0, + .sup_ext_to = 0, }, .spt_digitizer_cfg = { .ctrl = 0, @@ -422,7 +422,7 @@ struct qtouch_ts_platform_data stingray_touch_data_p1_or_later = { .abs_max_w = 15, .x_delta = 400, .y_delta = 250, - .nv_checksum = 0x0ee972, + .nv_checksum = 0x99469a, .fuzz_x = 0, .fuzz_y = 0, .fuzz_p = 2, @@ -444,9 +444,9 @@ struct qtouch_ts_platform_data stingray_touch_data_p1_or_later = { .base_fw_version = 0x00, }, .power_cfg = { - .idle_acq_int = 0x12, - .active_acq_int = 0x12, - .active_idle_to = 0x19, + .idle_acq_int = 0xff, + .active_acq_int = 0xff, + .active_idle_to = 0x00, }, .acquire_cfg = { .charge_time = 0x0A, @@ -467,28 +467,28 @@ struct qtouch_ts_platform_data stingray_touch_data_p1_or_later = { .x_size = 0x21, .y_size = 0x2a, .aks_cfg = 0, - .burst_len = 0x20, - .tch_det_thr = 0x23, - .tch_det_int = 0x2, + .burst_len = 0x10, + .tch_det_thr = 45, + .tch_det_int = 0x3, .orient = 1, .mrg_to = 0x00, - .mov_hyst_init = 0x32, - .mov_hyst_next = 0x14, - .mov_filter = 0x42, + .mov_hyst_init = 0x05, + .mov_hyst_next = 0x02, + .mov_filter = 0x20, .num_touch = 0x05, .merge_hyst = 0x0A, .merge_thresh = 0x0A, .amp_hyst = 0x0A, .x_res = 0x0FFF, .y_res = 0x0FFF, - .x_low_clip = 0x06, - .x_high_clip = 0x0A, - .y_low_clip = 0x05, - .y_high_clip = 0xFF, - .x_edge_ctrl = 0xCC, - .x_edge_dist = 0x25, - .y_edge_ctrl = 0xDC, - .y_edge_dist = 0x0A, + .x_low_clip = 0x00, + .x_high_clip = 0x00, + .y_low_clip = 0x00, + .y_high_clip = 0x00, + .x_edge_ctrl = 0, + .x_edge_dist = 0, + .y_edge_ctrl = 0, + .y_edge_dist = 0, .jump_limit = 0, .tch_thres_hyst = 0x09, .xpitch = 0, @@ -555,8 +555,8 @@ struct qtouch_ts_platform_data stingray_touch_data_p1_or_later = { .ctrl = 0, .command = 0, .reserve2 = 0, - .idle_gcaf_depth = 20, - .active_gcaf_depth = 20, + .idle_gcaf_depth = 16, + .active_gcaf_depth = 16, .voltage = 60, }, .gripsuppression_t40_cfg = { @@ -567,12 +567,12 @@ struct qtouch_ts_platform_data stingray_touch_data_p1_or_later = { .yhi_grip = 0, }, .palm_suppression_cfg = { - .ctrl = 0x1, + .ctrl = 0, .small_obj_thr = 0, .sig_spread_thr = 0, - .large_obj_thr = 0x24, - .distance_thr = 0x5, - .sup_ext_to = 0x5, + .large_obj_thr = 0, + .distance_thr = 0, + .sup_ext_to = 0, }, .spt_digitizer_cfg = { .ctrl = 0, -- 2.34.1