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

Commit fea9e467 authored by Nick Dyer's avatar Nick Dyer Committed by Dmitry Torokhov
Browse files

Input: atmel_mxt_ts - rename pressure to amplitude to match spec 



Signed-off-by: default avatarNick Dyer <nick.dyer@itdev.co.uk>
Acked-by: default avatarBenson Leung <bleung@chromium.org>
Acked-by: default avatarYufeng Shen <miletus@chromium.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 61dc1aba

drivers/input/touchscreen/atmel_mxt_ts.c

+4 −4
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ static void mxt_input_touchevent(struct mxt_data *data, 
	int x;

	int y;

	int area;

	int pressure;

	int amplitude;



	x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf);

	y = (message->message[2] << 4) | ((message->message[3] & 0xf));
@@ -673,7 +673,7 @@ static void mxt_input_touchevent(struct mxt_data *data, 
		y = y >> 2;



	area = message->message[4];

	pressure = message->message[5];

	amplitude = message->message[5];



	dev_dbg(dev,

		"[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n",
@@ -686,7 +686,7 @@ static void mxt_input_touchevent(struct mxt_data *data, 
		(status & MXT_AMP) ? 'A' : '.',

		(status & MXT_SUPPRESS) ? 'S' : '.',

		(status & MXT_UNGRIP) ? 'U' : '.',

		x, y, area, pressure);

		x, y, area, amplitude);



	input_mt_slot(input_dev, id);

	input_mt_report_slot_state(input_dev, MT_TOOL_FINGER,
@@ -695,7 +695,7 @@ static void mxt_input_touchevent(struct mxt_data *data, 
	if (status & MXT_DETECT) {

		input_report_abs(input_dev, ABS_MT_POSITION_X, x);

		input_report_abs(input_dev, ABS_MT_POSITION_Y, y);

		input_report_abs(input_dev, ABS_MT_PRESSURE, pressure);

		input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude);

		input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area);

	}

}