From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932111AbbJRPxk (ORCPT ); Sun, 18 Oct 2015 11:53:40 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:64334 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059AbbJRPxh (ORCPT ); Sun, 18 Oct 2015 11:53:37 -0400 From: Karsten Merker To: Bastien Nocera , Dmitry Torokhov , Irina Tirdea , Aleksei Mamlin , linux-input@vger.kernel.org, Ian Campbell Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chen-Yu Tsai , Karsten Merker Subject: [PATCH RFC V3 2/3] Input: goodix - use "inverted_[xy]" flags instead of "rotated_screen" Date: Sun, 18 Oct 2015 17:52:58 +0200 Message-Id: <1445183579-29176-3-git-send-email-merker@debian.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445183579-29176-1-git-send-email-merker@debian.org> References: <1445183579-29176-1-git-send-email-merker@debian.org> X-Provags-ID: V03:K0:bsM113d4LrOG6aCPRIpVQW9kH/dx7IQpw7IoN4zPJgot3W50oFF l4/CBHiY46CzpoHIuTk86qeEVVzUCKa0iP5pGFSYJqdWrAouyT4TSvfnM/d0C9DpChvqsmJ m6BCDJr7wAb5vNjkkutdCh9hrqEDKfGOe91VI3MGQgc9UZSm2OsKx6Bymy7e64gstNRJ620 zZ54pqoTHmtFimZZjRR5Q== X-UI-Out-Filterresults: notjunk:1;V01:K0:LU5ORi49p0A=:BIXcq9NWQ/vE3QgNlZS56L cbWI2Z50lBsffOSki3kLEhlNzQ5xMXzpbC7Ww8Sk0PowQKrIHlFjFEW/+3H3RGDXYIZl2dgsp ltp5qKEuLGvDwunSgsjmboRMQL8i8NnVbHjcXGFfzVIcbydl6wSvmDMIHXaV19s81rUA7T09a tiqD1z5OeAx7TtEZ3xdC2XEbZY31XlJzmwoELhKlPHIOVwZFq7FnwQxRo2ZVb/AHEppfUrAkc pRD9oA37Fn4RxKG/enzMlQDlb+6t06mInLLx9V5+1pU67R3YjYJDYLYkWHFcFzFqN0PQkgCta 1hvxkCTRTvyPtExSNZStxSaILskMNddQyFNu2PG3cuut7UNEc2aFCdHyqngQaKX/DNy/YBfsB jLnhpjHpQJGR0rmNH2trkuE2WiLk3Cy0Oa51vxJO1C1GfN3R6ENKxLbjztvytqBTnEO+nJWgB 1BGolzxImmDGO9slKzP7HD3kUKHhVR3ghvp3noy+Wx767ZQTz65ornL3H1iso71QOxBEvbshF oGtny9XFFOG+hZwntiYjpZJC9xY30GFoBWPBy+aZl9ILyPTTek0pvbq/xr/pJudiqncs/pBNA UWuvHJfpLWgi9d6K17lCTXjhdCJZ//p//j8Uu0w9Pg0Bm4rWTwcVWCd0RHjNfS9pCR3bMp9wB V6CLhqnSpvwsowX7kwMAsHWIvhx1iVWT7fCda4rh6yzDIW0J5MBaoazuAPaRCitZqdUY= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: Karsten Merker Reviewed-by: Irina Tirdea Tested-by: Bastien Nocera Acked-by: Bastien Nocera --- drivers/input/touchscreen/goodix.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index b585123..22eff28 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -40,7 +40,6 @@ struct goodix_ts_data { int abs_y_max; unsigned int max_touch_num; unsigned int int_trigger_type; - bool rotated_screen; int cfg_len; struct gpio_desc *gpiod_int; struct gpio_desc *gpiod_rst; @@ -270,11 +269,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_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 */ if (ts->inverted_x) input_x = ts->abs_x_max - input_x; @@ -701,10 +695,12 @@ static void goodix_read_config(struct goodix_ts_data *ts) ts->max_touch_num = GOODIX_MAX_CONTACTS; } - ts->rotated_screen = dmi_check_system(rotated_screen); - if (ts->rotated_screen) + if (dmi_check_system(rotated_screen)) { + ts->inverted_x = true; + ts->inverted_y = true; dev_dbg(&ts->client->dev, "Applying '180 degrees rotated screen' quirk\n"); + } } /** -- 2.1.4