diff options
author | Nick Dyer <nick.dyer@itdev.co.uk> | 2014-05-19 02:21:48 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-05-26 22:08:22 -0400 |
commit | fea9e4675d995e6251eecc4368e726580221bcc7 (patch) | |
tree | c0a33cb113dc6ce7ac1f0a960526639fa9271745 | |
parent | 61dc1abae64854c7cef543598b9e6f04886c4ebd (diff) |
Input: atmel_mxt_ts - rename pressure to amplitude to match spec
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Acked-by: Benson Leung <bleung@chromium.org>
Acked-by: Yufeng Shen <miletus@chromium.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 75493ca8e784..7efb288c31ed 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c | |||
@@ -663,7 +663,7 @@ static void mxt_input_touchevent(struct mxt_data *data, | |||
663 | int x; | 663 | int x; |
664 | int y; | 664 | int y; |
665 | int area; | 665 | int area; |
666 | int pressure; | 666 | int amplitude; |
667 | 667 | ||
668 | x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf); | 668 | x = (message->message[1] << 4) | ((message->message[3] >> 4) & 0xf); |
669 | y = (message->message[2] << 4) | ((message->message[3] & 0xf)); | 669 | y = (message->message[2] << 4) | ((message->message[3] & 0xf)); |
@@ -673,7 +673,7 @@ static void mxt_input_touchevent(struct mxt_data *data, | |||
673 | y = y >> 2; | 673 | y = y >> 2; |
674 | 674 | ||
675 | area = message->message[4]; | 675 | area = message->message[4]; |
676 | pressure = message->message[5]; | 676 | amplitude = message->message[5]; |
677 | 677 | ||
678 | dev_dbg(dev, | 678 | dev_dbg(dev, |
679 | "[%u] %c%c%c%c%c%c%c%c x: %5u y: %5u area: %3u amp: %3u\n", | 679 | "[%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, | |||
686 | (status & MXT_AMP) ? 'A' : '.', | 686 | (status & MXT_AMP) ? 'A' : '.', |
687 | (status & MXT_SUPPRESS) ? 'S' : '.', | 687 | (status & MXT_SUPPRESS) ? 'S' : '.', |
688 | (status & MXT_UNGRIP) ? 'U' : '.', | 688 | (status & MXT_UNGRIP) ? 'U' : '.', |
689 | x, y, area, pressure); | 689 | x, y, area, amplitude); |
690 | 690 | ||
691 | input_mt_slot(input_dev, id); | 691 | input_mt_slot(input_dev, id); |
692 | input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, | 692 | input_mt_report_slot_state(input_dev, MT_TOOL_FINGER, |
@@ -695,7 +695,7 @@ static void mxt_input_touchevent(struct mxt_data *data, | |||
695 | if (status & MXT_DETECT) { | 695 | if (status & MXT_DETECT) { |
696 | input_report_abs(input_dev, ABS_MT_POSITION_X, x); | 696 | input_report_abs(input_dev, ABS_MT_POSITION_X, x); |
697 | input_report_abs(input_dev, ABS_MT_POSITION_Y, y); | 697 | input_report_abs(input_dev, ABS_MT_POSITION_Y, y); |
698 | input_report_abs(input_dev, ABS_MT_PRESSURE, pressure); | 698 | input_report_abs(input_dev, ABS_MT_PRESSURE, amplitude); |
699 | input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area); | 699 | input_report_abs(input_dev, ABS_MT_TOUCH_MAJOR, area); |
700 | } | 700 | } |
701 | } | 701 | } |