From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757374AbbJIR5j (ORCPT ); Fri, 9 Oct 2015 13:57:39 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:49370 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753878AbbJIR5h (ORCPT ); Fri, 9 Oct 2015 13:57: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 V2 1/3] Input: goodix - add dt axis swapping and axis inversion support Date: Fri, 9 Oct 2015 19:55:50 +0200 Message-Id: <1444413352-24529-2-git-send-email-merker@debian.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444413352-24529-1-git-send-email-merker@debian.org> References: <1444413352-24529-1-git-send-email-merker@debian.org> X-Provags-ID: V03:K0:svE8Sfs34xQrH5UhH9kFmy6prY64hh2vmhpc2FGHEXDs4Zdo0kR gxKh/yGsMNEkeJteqQuxqeWeXYBwtAYFxUcofZRF5uoLDpZuQVzEv8ZA7u8HZdNMuVbdjTI 285r6H8+7Fai/zjDcSXSvu6tbS6Q/xA9p/IFyuPXeFfSI7J0MPQd7NOaXMC4LnsmCIcLskr TSX+gJoDZvMd6yRCmRnQQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:NTJw31Ro824=:YE3PcQVPjUSOkEn8UNln3q dh9a1yP5fmoiksHTj1sDc4nKYwkGqwZT28iCREif17yPLAtYRE1WTPOCc9V8B2P1CliFNjQT6 mSbAaRO8akr9sgqpQHUz0u5triC3u/BalWMHciE5zSM8EYn0EBGfJuI+qCqqKFxyI8bLqy64q I+7BRZL8nvG+kktESicxbMKmpXXyLmMWQVxhowhu1srgfDtQ9XChfvReFSPLMOgkHVb0OkmfV vBPd1E+uLNhfDmxaS93b9vb8ZHwj/TY+Vis0pjDfunY6dX6tv2PL7hl+aMLcAFID+mVFRN5zL N3tUmIBRSF8xL9kaCmh8p/YNV4805x40rrn1MS3ZhT1CtwIJyFolTXrjESZmILIs9unQCu6Vw qpROwf295Ge2ET1ztj3Agp4wGsFqRt4g8a+voS71m5mG5PyA3bQG27aFIUqP6X+G9sRveZ0l3 JaqXcdsgaurmAqzOOGCg1Y7sTujWbkJ1ubR89hfNBl0LgZwRBGnx1ynq9xNnw4Jx5bFXAGHBr bZgLCAeN3Y1Hqf2GGDwoP2BaD4R3kLQp9yKm6HW1jEA7S7yoGbrwWbEyeG5yQSAgutC+YJvh2 k1bFlCueAgaIhNIrxJbMz3C9bJhqK3wl3e59+lMLKCvJFNwuGiKAk1wUDRi6Fyp29Rmy/y3Cq T0hJgbt942E4bRYHGurjVHUMXGKaTyBdrQdXA0Xy/kBR9wo9ogrs3xQahvs68gMDKWYk= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement support for the following device-tree properties in the goodix touchscreen driver: - touchscreen-inverted-x: X axis is inverted (boolean) - touchscreen-inverted-y: Y axis is inverted (boolean) - touchscreen-swapped-x-y: X and Y axis are swapped (boolean) These are necessary on tablets which have a display in portrait format while the touchscreen is in landscape format, such as e.g. the MSI Primo 81. Signed-off-by: Karsten Merker --- drivers/input/touchscreen/goodix.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index 22bfc4b..a05bdad 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -2,6 +2,7 @@ * Driver for Goodix Touchscreens * * Copyright (c) 2014 Red Hat Inc. + * Copyright (c) 2015 K. Merker * * This code is based on gt9xx.c authored by andrew@goodix.com: * @@ -53,6 +54,9 @@ struct goodix_ts_data { atomic_t open_count; /* Protects power management calls and access to suspended flag */ struct mutex mutex; + bool swapped_x_y; + bool inverted_x; + bool inverted_y; }; #define GOODIX_GPIO_INT_NAME "irq" @@ -271,6 +275,14 @@ static void goodix_ts_report_touch(struct goodix_ts_data *ts, u8 *coor_data) 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; + if (ts->inverted_y) + input_y = ts->abs_y_max - input_y; + if (ts->swapped_x_y) + swap(input_x, input_y); + input_mt_slot(ts->input_dev, id); input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, true); input_report_abs(ts->input_dev, ABS_MT_POSITION_X, input_x); @@ -666,6 +678,8 @@ static void goodix_read_config(struct goodix_ts_data *ts) error); ts->abs_x_max = GOODIX_MAX_WIDTH; ts->abs_y_max = GOODIX_MAX_HEIGHT; + if (ts->swapped_x_y) + swap(ts->abs_x_max, ts->abs_y_max); ts->int_trigger_type = GOODIX_INT_TRIGGER; ts->max_touch_num = GOODIX_MAX_CONTACTS; return; @@ -673,6 +687,8 @@ static void goodix_read_config(struct goodix_ts_data *ts) ts->abs_x_max = get_unaligned_le16(&config[RESOLUTION_LOC]); ts->abs_y_max = get_unaligned_le16(&config[RESOLUTION_LOC + 2]); + if (ts->swapped_x_y) + swap(ts->abs_x_max, ts->abs_y_max); ts->int_trigger_type = config[TRIGGER_LOC] & 0x03; ts->max_touch_num = config[MAX_CONTACTS_LOC] & 0x0f; if (!ts->abs_x_max || !ts->abs_y_max || !ts->max_touch_num) { @@ -680,6 +696,8 @@ static void goodix_read_config(struct goodix_ts_data *ts) "Invalid config, using defaults\n"); ts->abs_x_max = GOODIX_MAX_WIDTH; ts->abs_y_max = GOODIX_MAX_HEIGHT; + if (ts->swapped_x_y) + swap(ts->abs_x_max, ts->abs_y_max); ts->max_touch_num = GOODIX_MAX_CONTACTS; } @@ -950,6 +968,15 @@ static int goodix_ts_probe(struct i2c_client *client, return 0; } +#ifdef CONFIG_OF + ts->swapped_x_y = of_property_read_bool(client->dev.of_node, + "touchscreen-swapped-x-y"); + ts->inverted_x = of_property_read_bool(client->dev.of_node, + "touchscreen-inverted-x"); + ts->inverted_y = of_property_read_bool(client->dev.of_node, + "touchscreen-inverted-y"); +#endif + return goodix_configure_dev(ts); err_free_cfg_name: -- 2.1.4