Commit 57c80e8e authored by Karsten Merker's avatar Karsten Merker Committed by Dmitry Torokhov

Input: goodix - use "inverted_[xy]" flags instead of "rotated_screen"

The goodix touchscreen driver uses a "rotated_screen" flag for
systems on which the touchscreen is mounted rotated by 180
degrees with respect to the display.  With the addition of
support for the dt properties "touchscreen-inverted-x" and
"touchscreen-inverted-y", a separate "rotated_screen" flag
is not necessary anymore. This patch replaces it by setting
the inverted_x and inverted_y flags instead.
Signed-off-by: default avatarKarsten Merker <merker@debian.org>
Reviewed-by: default avatarIrina Tirdea <irina.tirdea@intel.com>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Acked-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent ad48cf5e
...@@ -41,7 +41,6 @@ struct goodix_ts_data { ...@@ -41,7 +41,6 @@ struct goodix_ts_data {
bool inverted_y; bool inverted_y;
unsigned int max_touch_num; unsigned int max_touch_num;
unsigned int int_trigger_type; unsigned int int_trigger_type;
bool rotated_screen;
int cfg_len; int cfg_len;
struct gpio_desc *gpiod_int; struct gpio_desc *gpiod_int;
struct gpio_desc *gpiod_rst; struct gpio_desc *gpiod_rst;
...@@ -234,11 +233,6 @@ static void goodix_ts_report_touch(struct goodix_ts_data *ts, u8 *coor_data) ...@@ -234,11 +233,6 @@ static void goodix_ts_report_touch(struct goodix_ts_data *ts, u8 *coor_data)
int input_y = get_unaligned_le16(&coor_data[3]); int input_y = get_unaligned_le16(&coor_data[3]);
int input_w = get_unaligned_le16(&coor_data[5]); int input_w = get_unaligned_le16(&coor_data[5]);
if (ts->rotated_screen) {
input_x = ts->abs_x_max - input_x;
input_y = ts->abs_y_max - input_y;
}
/* Inversions have to happen before axis swapping */ /* Inversions have to happen before axis swapping */
if (ts->inverted_x) if (ts->inverted_x)
input_x = ts->abs_x_max - input_x; input_x = ts->abs_x_max - input_x;
...@@ -521,10 +515,12 @@ static void goodix_read_config(struct goodix_ts_data *ts) ...@@ -521,10 +515,12 @@ static void goodix_read_config(struct goodix_ts_data *ts)
ts->max_touch_num = GOODIX_MAX_CONTACTS; ts->max_touch_num = GOODIX_MAX_CONTACTS;
} }
ts->rotated_screen = dmi_check_system(rotated_screen); if (dmi_check_system(rotated_screen)) {
if (ts->rotated_screen) ts->inverted_x = true;
ts->inverted_y = true;
dev_dbg(&ts->client->dev, dev_dbg(&ts->client->dev,
"Applying '180 degrees rotated screen' quirk\n"); "Applying '180 degrees rotated screen' quirk\n");
}
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment