Input: synaptics_i2c_rmi: Driver for Synaptics Touchscreens using RMI over I2C.
Arve Hjønnevåg [Mon, 16 Apr 2012 07:17:49 +0000 (12:17 +0530)]
Signed-off-by: Arve Hjønnevåg <arve@android.com>

Input: synaptics_i2c_rmi: disable_irq -> disable_irq_nosync

Also remove duplicate swap macro

Change-Id: I77266431ba5c267a5d92c4bdc2f127a5297065a8
Signed-off-by: Arve Hjønnevåg <arve@android.com>

Conflicts:

drivers/input/touchscreen/synaptics_i2c_rmi.c

Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

drivers/input/touchscreen/synaptics_i2c_rmi.c

index 5a99fa5..e7c49ed 100644 (file)
@@ -495,6 +495,7 @@ static int 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);
        inactive_area_left = inactive_area_left * max_x / 0x10000;
        inactive_area_right = inactive_area_right * max_x / 0x10000;
@@ -533,6 +534,8 @@ static int synaptics_ts_probe(
        input_set_abs_params(ts->input_dev, ABS_Y, -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);
        input_set_abs_params(ts->input_dev, ABS_MT_POSITION_X, -inactive_area_left, max_x + inactive_area_right, fuzz_x, 0);
        input_set_abs_params(ts->input_dev, ABS_MT_POSITION_Y, -inactive_area_top, max_y + inactive_area_bottom, fuzz_y, 0);
        input_set_abs_params(ts->input_dev, ABS_MT_TOUCH_MAJOR, 0, 255, fuzz_p, 0);