Staging: dream: Synaptic: Remove non-standard multi touch support

Signed-off-by: Hemanth V <hemanthv@ti.com>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/dream/synaptics_i2c_rmi.c b/drivers/staging/dream/synaptics_i2c_rmi.c
index ae2f72c..e34d11f 100644 (file)
--- a/drivers/staging/dream/synaptics_i2c_rmi.c
+++ b/drivers/staging/dream/synaptics_i2c_rmi.c
@@ -109,9 +109,7 @@ static void decode_report(struct synaptics_ts_data *ts, u8 *buf)
        int f, a;
        int base = 2;
        int z = buf[1];
-       int w = buf[0] >> 4;
        int finger = buf[0] & 7;
-       int finger2_pressed;
 
        for (f = 0; f < 2; f++) {
                u32 flip_flag = SYNAPTICS_FLIP_X;
@@ -151,14 +149,7 @@ static void decode_report(struct synaptics_ts_data *ts, u8 *buf)
                input_report_abs(ts->input_dev, ABS_Y, pos[0][1]);
        }
        input_report_abs(ts->input_dev, ABS_PRESSURE, z);
-       input_report_abs(ts->input_dev, ABS_TOOL_WIDTH, w);
        input_report_key(ts->input_dev, BTN_TOUCH, finger);
-       finger2_pressed = finger > 1 && finger != 7;
-       input_report_key(ts->input_dev, BTN_2, finger2_pressed);
-       if (finger2_pressed) {
-               input_report_abs(ts->input_dev, ABS_HAT0X, pos[1][0]);
-               input_report_abs(ts->input_dev, ABS_HAT0Y, pos[1][1]);
-       }
        input_sync(ts->input_dev);
 }
 
@@ -347,11 +338,6 @@ static void compute_areas(struct synaptics_ts_data *ts,
                             -inactive_area_top, max_y + inactive_area_bottom,
                             fuzz_y, 0);
        input_set_abs_params(ts->input_dev, ABS_PRESSURE, 0, 255, fuzz_p, 0);
-       input_set_abs_params(ts->input_dev, ABS_TOOL_WIDTH, 0, 15, fuzz_w, 0);
-       input_set_abs_params(ts->input_dev, ABS_HAT0X, -inactive_area_left,
-                            max_x + inactive_area_right, fuzz_x, 0);
-       input_set_abs_params(ts->input_dev, ABS_HAT0Y, -inactive_area_top,
-                            max_y + inactive_area_bottom, fuzz_y, 0);
 }
 
 static struct synaptics_i2c_rmi_platform_data fake_pdata;
@@ -487,7 +473,6 @@ static int __devinit synaptics_ts_probe(
        __set_bit(EV_SYN, ts->input_dev->evbit);
        __set_bit(EV_KEY, ts->input_dev->evbit);
        __set_bit(BTN_TOUCH, ts->input_dev->keybit);
-       __set_bit(BTN_2, ts->input_dev->keybit);
        __set_bit(EV_ABS, ts->input_dev->evbit);
 
        compute_areas(ts, pdata, max_x, max_y);