Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd2d64b1 authored by Mike Rapoport's avatar Mike Rapoport Committed by Dmitry Torokhov
Browse files

Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events 



Add BTN_TOUCH event reporting to ucb1400_ts and accelerated mainstone-wm97xx
touchscreen drivers. Together with previously posted similar patch for
wm97xx-core this will make all touchscreen drivers behave consistently wrt.
BTN_TOUCH.

Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent a700e72d

drivers/input/touchscreen/mainstone-wm97xx.c

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ static int wm97xx_acc_pen_down(struct wm97xx *wm) 
		input_report_abs(wm->input_dev, ABS_X, x & 0xfff);

		input_report_abs(wm->input_dev, ABS_Y, y & 0xfff);

		input_report_abs(wm->input_dev, ABS_PRESSURE, p & 0xfff);

		input_report_key(wm->input_dev, BTN_TOUCH, (p != 0));

		input_sync(wm->input_dev);

		reads++;

	} while (reads < cinfo[sp_idx].reads);

drivers/input/touchscreen/ucb1400_ts.c

+4 −1
Original line number Diff line number Diff line
@@ -151,12 +151,14 @@ static void ucb1400_ts_evt_add(struct input_dev *idev, u16 pressure, u16 x, u16 
	input_report_abs(idev, ABS_X, x);

	input_report_abs(idev, ABS_Y, y);

	input_report_abs(idev, ABS_PRESSURE, pressure);

	input_report_key(idev, BTN_TOUCH, 1);

	input_sync(idev);

}



static void ucb1400_ts_event_release(struct input_dev *idev)

{

	input_report_abs(idev, ABS_PRESSURE, 0);

	input_report_key(idev, BTN_TOUCH, 0);

	input_sync(idev);

}
@@ -377,7 +379,8 @@ static int ucb1400_ts_probe(struct platform_device *dev) 
	ucb->ts_idev->id.product	= ucb->id;

	ucb->ts_idev->open		= ucb1400_ts_open;

	ucb->ts_idev->close		= ucb1400_ts_close;

	ucb->ts_idev->evbit[0]		= BIT_MASK(EV_ABS);

	ucb->ts_idev->evbit[0]		= BIT_MASK(EV_ABS) | BIT_MASK(EV_KEY);

	ucb->ts_idev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);



	ucb1400_adc_enable(ucb->ac97);

	x_res = ucb1400_ts_read_xres(ucb);