From patchwork Sat Aug 31 03:09:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Cai X-Patchwork-Id: 11124735 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DD5441399 for ; Sat, 31 Aug 2019 03:10:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B09E923697 for ; Sat, 31 Aug 2019 03:10:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=typeblog-net.20150623.gappssmtp.com header.i=@typeblog-net.20150623.gappssmtp.com header.b="FxDkvpiL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbfHaDKd (ORCPT ); Fri, 30 Aug 2019 23:10:33 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38754 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726649AbfHaDKc (ORCPT ); Fri, 30 Aug 2019 23:10:32 -0400 Received: by mail-pg1-f194.google.com with SMTP id e11so4444057pga.5 for ; Fri, 30 Aug 2019 20:10:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=typeblog-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xPp/KNeXkBz5eBYg4mT+UA0qSZaP/9dyi5AxdOhW8oY=; b=FxDkvpiLmDCdVySmdKZFxU+2EWG20fKrRnf810YGsm3sKyNqJj1MWnVW0tk2eCnr3i GLP+gnBwlz7OLbQitK8znNiv1RsFw6mxfxKzg/HaE4ObLZZ4iQZ8EBIAu2fKDwc6ZNy4 Fjoa89AzJ9MtWSGUjfmL4LuEyg/dkT/67EkioOiqmp2oWovIKYae/Athutb2V3Sz9GBJ 8v+Wy05IzpzJG9ctYb3A3G2xy4zUWzrynpWZx4O7enZAlazh7RTyiKqfRd7tOvHpkl3m Zyt403oqlfbqEw3cJfLUGC7TjLFzICr1l2cy6Jr/7q4bJWHpJIQCq04Y+nthKCJqfpn8 jMWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xPp/KNeXkBz5eBYg4mT+UA0qSZaP/9dyi5AxdOhW8oY=; b=mkSON0FwVvMGQGWNDhuE7W6pyci3DkQk3j6s9eSIi48DH6Xene3nyZqe9NzmomEPXo 7VnRnSDlnlSjGTEkob/KBKdPRNTdXubHsQZ0sLOP0TOy/gyClDrppISpAsoNN0kgohM2 9cqozeS4pDvhcmwByRf0XD8Nwu42UDZQTYYagI13aw4tWOJz/gsmYm4l8nIENbExLIUx ifq5yOU9tfW2YAlgfXP8Kw5C5UXbM+Pim5E/wINYDEDQO9KOLY71MyfXvZYYvIMhaXKy Hsoe5d7zwZDTWjhZOtJbp22o0Za8R9i8XrebCMKptzubslWm36Qm0c4fudENM/OlWgG2 9LQw== X-Gm-Message-State: APjAAAUPOdtLOeWV8d6hcZQEqzzMD1j1u42CkT9I4bqWT9r/91rRtgb+ 6Q1vBeZXGsykoIrV1/E3BM7+2f8Gn2pNdA== X-Google-Smtp-Source: APXvYqyleC9XvInNiTuUuZU4vpeR5UtTD2SFLPqm9Q3cOcEE/uZaNhwkLgxs2UsAggMgWosJ1+NyAQ== X-Received: by 2002:a65:6406:: with SMTP id a6mr15168119pgv.393.1567221031768; Fri, 30 Aug 2019 20:10:31 -0700 (PDT) Received: from peter-pc.home ([91.207.174.229]) by smtp.gmail.com with ESMTPSA id 185sm10961454pff.54.2019.08.30.20.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 20:10:30 -0700 (PDT) From: Peter Cai Cc: "Rafael J. Wysocki" , Len Brown , Peter Cai , Mika Westerberg , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , Bastien Nocera , Dmitry Torokhov , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH v2 1/2] gpio: acpi: add quirk to override GpioInt polarity Date: Sat, 31 Aug 2019 11:09:14 +0800 Message-Id: <20190831030916.13172-1-peter@typeblog.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On GPD P2 Max, the firmware could not reset the touch panel correctly. The kernel needs to take on the job instead, but the GpioInt definition in DSDT specifies ActiveHigh while the GPIO pin should actually be ActiveLow. We need to override the polarity defined by DSDT. The GPIO driver already allows defining polarity in acpi_gpio_params, but the option is not applied to GpioInt. This patch adds a new quirk that enables the polarity specified in acpi_gpio_params to also be applied to GpioInt. Signed-off-by: Peter Cai Acked-by: Andy Shevchenko Acked-by: Linus Walleij --- v2: rebased to gpio/for-next, moved quirk out of the gpioint conditional. --- drivers/gpio/gpiolib-acpi.c | 9 +++++++++ include/linux/gpio/consumer.h | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index fdee8afa5339..ab16ea61a8fa 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -603,6 +603,15 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data) lookup->info.flags = acpi_gpio_to_gpiod_flags(agpio); lookup->info.polarity = lookup->active_low; } + + /* + * Override the polarity specified by GpioInt if + * ACPI_GPIO_QUIRK_OVERRIDE_POLARITY is set. + */ + if (lookup->info.quirks & ACPI_GPIO_QUIRK_OVERRIDE_POLARITY) { + dev_warn(&lookup->info.adev->dev, FW_BUG "Incorrect polarity specified by GpioInt, overriding.\n"); + lookup->info.polarity = lookup->active_low; + } } return 1; diff --git a/include/linux/gpio/consumer.h b/include/linux/gpio/consumer.h index b70af921c614..7e9f24ebb085 100644 --- a/include/linux/gpio/consumer.h +++ b/include/linux/gpio/consumer.h @@ -622,6 +622,12 @@ struct acpi_gpio_mapping { * get GpioIo type explicitly, this quirk may be used. */ #define ACPI_GPIO_QUIRK_ONLY_GPIOIO BIT(1) +/* + * Use the GPIO polarity (ActiveHigh / ActiveLow) from acpi_gpio_params + * for GpioInt as well. The default behavior is to use the one specified + * by GpioInt, which can be incorrect on some devices. + */ +#define ACPI_GPIO_QUIRK_OVERRIDE_POLARITY BIT(2) unsigned int quirks; }; From patchwork Sat Aug 31 03:09:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Cai X-Patchwork-Id: 11124741 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF05918EC for ; Sat, 31 Aug 2019 03:10:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3F4523697 for ; Sat, 31 Aug 2019 03:10:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=typeblog-net.20150623.gappssmtp.com header.i=@typeblog-net.20150623.gappssmtp.com header.b="KlKjRfva" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728373AbfHaDKk (ORCPT ); Fri, 30 Aug 2019 23:10:40 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40981 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728334AbfHaDKj (ORCPT ); Fri, 30 Aug 2019 23:10:39 -0400 Received: by mail-pg1-f194.google.com with SMTP id x15so4439917pgg.8 for ; Fri, 30 Aug 2019 20:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=typeblog-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXbglKvD0SQmCRxcZtB9WBlJczTPMt6e3pZqM3DgZ18=; b=KlKjRfvad7u6uFblyFqzf8FnNcX/HdKZa8Ou7elxmC+GPWRiGv+M/RH//EOe2nn4WN kTz+vJODFike6WQUKh1X9zklhP/gQSg7k7yme0uYvo3xoTNXSWWdukoFtziz0ugRRCJk t48o7jdirGq7ZMKPb/rUguEBC2sL/3AOcRGxLv3vrocVmgly3k6DzImNxELKh3fZpHA8 ShSM0+CW3qBBi8sQZ4RUv7/ZQVA0Tra/QbupG06R2cMpu3WfNpJjwG489pxusCqsYlZp HPW9iZpwXScQT0SuB1dKoi7Rqi2Kk9KpVOfTEkhsSU0RX2Rwhj+cUdkFV9fH7Xi1PWmn ZTsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SXbglKvD0SQmCRxcZtB9WBlJczTPMt6e3pZqM3DgZ18=; b=YniW9NPjthk784HpQGj3+O6dvyLomh6oKJeOR+Fj2TI5bwHLdgI3GkjkH7/8j/h8Xc 0P+N66NMnSfJ2GxPRxDVzEdj3LDIxN3KL4rQsGLfl5r8qMGoEGP9OnlyCqu29zJ1NY9o CpcXqlZDwlyBTgfY0ErFc7oC9hZi98gKmQV7bxey5bVq14zZLo3gY2EM9VJGwSGWEjVW 5OgWmpTqPuKj/0R/pvKDwADkPXpasNGyTYJs9L81PywRoREtDtutKsdcS4YofVuUHSGs KY4uvEMB48iXYm9YU1EQUoIj/7AJogh6VFWhq5i7j5J4Ne/aVsFkDrK9I+BKoPfxBEWs LMaw== X-Gm-Message-State: APjAAAUlMvKDIgnZTRX8YFvWK21B2rMA3DQtPe6F0KmLz4u9ccvh5wP+ UcvUMNoRCm6bXP5dn/xSRyLARQ== X-Google-Smtp-Source: APXvYqy3AvEy6GfXGMsBVelFOUgqliOk3kGp0ODR2dCYzbwoReny6L9IgY3VfEzMVZ4Htgn0gs/zcw== X-Received: by 2002:a17:90a:a00b:: with SMTP id q11mr1783420pjp.91.1567221039116; Fri, 30 Aug 2019 20:10:39 -0700 (PDT) Received: from peter-pc.home ([91.207.174.229]) by smtp.gmail.com with ESMTPSA id 185sm10961454pff.54.2019.08.30.20.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Aug 2019 20:10:38 -0700 (PDT) From: Peter Cai Cc: "Rafael J. Wysocki" , Len Brown , Peter Cai , Mika Westerberg , Andy Shevchenko , Linus Walleij , Bartosz Golaszewski , Bastien Nocera , Dmitry Torokhov , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: [PATCH v2 2/2] touchscreen: goodix: define GPIO mapping for GPD P2 Max Date: Sat, 31 Aug 2019 11:09:15 +0800 Message-Id: <20190831030916.13172-2-peter@typeblog.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190831030916.13172-1-peter@typeblog.net> References: <20190831030916.13172-1-peter@typeblog.net> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org The firmware of GPD P2 Max could not handle panel resets although code is present in DSDT. The kernel needs to take on this job instead, but the DSDT does not provide _DSD, rendering kernel helpless when trying to find the respective GPIO pins. Fortunately, this time GPD has proper DMI vendor / product strings that we could match against. We simply apply an acpi_gpio_mapping table when GPD P2 Max is matched. Additionally, the DSDT definition of the irq pin specifies a wrong polarity. The new quirk introduced in the previous patch (ACPI_GPIO_QUIRK_OVERRIDE_POLARITY) is applied to correct this. Signed-off-by: Peter Cai Reviewed-by: Andy Shevchenko --- v2: removed '#ifdef CONFIG_ACPI' as per suggestion. The #ifdef guards for CONFIG_DMI is kept for consistency with the other dmi_system_id definition in the same file. --- drivers/input/touchscreen/goodix.c | 31 ++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index 5178ea8b5f30..df476f7dcd95 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c @@ -144,6 +144,31 @@ static const struct dmi_system_id rotated_screen[] = { {} }; +static const struct acpi_gpio_params irq_gpios_default = { 0, 0, false }; +static const struct acpi_gpio_params reset_gpios_default = { 1, 0, false }; +static const struct acpi_gpio_mapping gpio_mapping_force_irq_active_high[] = { + { "irq-gpios", &irq_gpios_default, 1, ACPI_GPIO_QUIRK_OVERRIDE_POLARITY }, + { "reset-gpios", &reset_gpios_default, 1 }, + {} +}; + +/* + * Devices that need acpi_gpio_mapping to function correctly + */ +static const struct dmi_system_id need_gpio_mapping[] = { +#if defined(CONFIG_DMI) && defined(CONFIG_X86) + { + .ident = "GPD P2 Max", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GPD"), + DMI_MATCH(DMI_PRODUCT_NAME, "P2 MAX") + }, + .driver_data = &gpio_mapping_force_irq_active_high + }, +#endif + {} +}; + /** * goodix_i2c_read - read data from a register of the i2c slave device. * @@ -795,6 +820,12 @@ static int goodix_ts_probe(struct i2c_client *client, { struct goodix_ts_data *ts; int error; + struct dmi_system_id *dmi_match; + + dmi_match = dmi_first_match(need_gpio_mapping); + if (dmi_match) + devm_acpi_dev_add_driver_gpios(&client->dev, + dmi_match->driver_data); dev_dbg(&client->dev, "I2C Address: 0x%02x\n", client->addr);