From nobody Thu Dec 18 17:58:44 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A3FC6FA8C for ; Tue, 6 Sep 2022 18:36:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229801AbiIFSfb (ORCPT ); Tue, 6 Sep 2022 14:35:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229935AbiIFSfJ (ORCPT ); Tue, 6 Sep 2022 14:35:09 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6F6131216; Tue, 6 Sep 2022 11:35:04 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id p18so12127142plr.8; Tue, 06 Sep 2022 11:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date; bh=Qv7vr9hnlWPJCQbWCubbxvr7dX1UFw3F8MYYEI1by0g=; b=Mz0MdMZDEGT5vR197DGR6zwttYMpvkEWvq22F7MToy76uIYP2muNZ0snvsZHaVgv7P jV2aRPG3FFPyrbGrJHgjBmWkKzmYjauq2uKEVplqOnFi8jY+MLqWwWHhp5Dueuwiul4A mvL5fmXV6WAOHtYR6MXd/sJSqp8NctJCC2Mj0uTQFp6b8XdOtViLHQSF5fWoKXeN0biW VlVRDMi/MCtGvXYiwEieDCHDbNw5WTTB2W5xzVPvN6orARGRUrwheYouCPto0cfbIC8m TlxNb1fjlTrcBDqXrib1IKv1FwFsrYxAiiLGHYhiKhTLkP/9ITr1JdeUx3nTl5I7IYgl uNZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date; bh=Qv7vr9hnlWPJCQbWCubbxvr7dX1UFw3F8MYYEI1by0g=; b=4RNWPNVyce0ZsUEBM5gNfDWCTuRkE3S63ifR72+Eu69cy7Hh0DqqmRuhHXDDwu7Gn4 z0AsOYjXynmAOMlmeEZA4+RiEenLhaqEM2Fy/h0ZrN+Kzh1oHtSFsCIGdbzsVOPMU70r yJtn99+tclS1P50Q5YveblWYj3WympILR6pdbimqsL+IfBszb0b+GoNLyDcdmWj5noZ3 lTRA77gr6lVLD+b1PlHRShOXvEZiKHW1idia+Gpl2e7oGmJt1Ub1rzHiuqpIsrbrpQGL Z36Id3rIOazWv/qRhOH73gYJrQ9BPyE5tirpiVN40KWWzvHLuS6KO1eEdYrEexHRPb3J AOfg== X-Gm-Message-State: ACgBeo2JMLNUO1LXUqokoCPn5NOQgt640yGvjb2e/Xr8Fss1JrCCmCSB xbZnqlwX62twkOpTh2SZ154= X-Google-Smtp-Source: AA6agR61r4MuX3r6sIQoB66/rvq8hkX+StGN4IgVkM4CTKlkH4yuvF8dXMVkTHOZMgfR9c3r94IJkQ== X-Received: by 2002:a17:90b:3144:b0:1f5:2c6d:7dea with SMTP id ip4-20020a17090b314400b001f52c6d7deamr25642211pjb.220.1662489304003; Tue, 06 Sep 2022 11:35:04 -0700 (PDT) Received: from google.com ([2620:15c:202:201:1190:fbfa:ae95:111c]) by smtp.gmail.com with ESMTPSA id w128-20020a626286000000b0053dc56afd3csm4807504pfb.219.2022.09.06.11.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 11:35:03 -0700 (PDT) Date: Tue, 6 Sep 2022 11:35:00 -0700 From: Dmitry Torokhov To: Lee Jones , Thierry Reding , Jonathan Hunter Cc: Rob Herring , Krzysztof Kozlowski , Maxime Coquelin , Alexandre Torgue , Francesco Dolcini , Linus Walleij , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2] mfd: stmpe: switch to using gpiod API Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch switches the driver away from legacy gpio/of_gpio API to gpiod API, and removes use of of_get_named_gpio_flags() which I want to make private to gpiolib. We also need to patch relevant DTS files, as the original code relied on the fact that of_get_named_gpio_flags() would fetch any data encoded in GPIO flags, even if it does not reflect valid flags for a GPIO. Signed-off-by: Dmitry Torokhov Reviewed-by: Linus Walleij --- v1->v2: - add DTS changes, as noticed by Francesco Dolcini. I guess we could do a dance of changing stmpe to check the flags coming from DTS and try to distinguish IRQ flags from proper GPIO flags, then have a separate patch changing DTSes, and finally a 2nd patch to stmpe to use GPIOD API, but I am hoping we could apply this in one go... arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 2 +- arch/arm/boot/dts/tegra30-apalis.dtsi | 2 +- arch/arm/boot/dts/tegra30-colibri.dtsi | 2 +- drivers/mfd/stmpe.c | 36 ++++++++-------------- 4 files changed, 16 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts= /tegra30-apalis-v1.1.dtsi index 380f22a35821..a1bcd67fa505 100644 --- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi @@ -993,7 +993,7 @@ ldo8_reg: ldo8 { touchscreen@41 { compatible =3D "st,stmpe811"; reg =3D <0x41>; - irq-gpio =3D <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>; + irq-gpio =3D <&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>; interrupt-controller; id =3D <0>; blocks =3D <0x5>; diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegr= a30-apalis.dtsi index 9bdc4cb71449..99d7dad72d29 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi +++ b/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -976,7 +976,7 @@ ldo8_reg: ldo8 { touchscreen@41 { compatible =3D "st,stmpe811"; reg =3D <0x41>; - irq-gpio =3D <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>; + irq-gpio =3D <&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>; interrupt-controller; id =3D <0>; blocks =3D <0x5>; diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/teg= ra30-colibri.dtsi index 310dff05910d..2867a138e011 100644 --- a/arch/arm/boot/dts/tegra30-colibri.dtsi +++ b/arch/arm/boot/dts/tegra30-colibri.dtsi @@ -849,7 +849,7 @@ ldo8_reg: ldo8 { touchscreen@41 { compatible =3D "st,stmpe811"; reg =3D <0x41>; - irq-gpio =3D <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>; + irq-gpio =3D <&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>; interrupt-controller; id =3D <0>; blocks =3D <0x5>; diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c index 987e251d90ae..0c4f74197d3e 100644 --- a/drivers/mfd/stmpe.c +++ b/drivers/mfd/stmpe.c @@ -8,14 +8,13 @@ */ =20 #include -#include +#include #include #include #include #include #include #include -#include #include #include #include @@ -30,17 +29,12 @@ * @irq_trigger: IRQ trigger to use for the interrupt to the host * @autosleep: bool to enable/disable stmpe autosleep * @autosleep_timeout: inactivity timeout in milliseconds for autosleep - * @irq_over_gpio: true if gpio is used to get irq - * @irq_gpio: gpio number over which irq will be requested (significant on= ly if - * irq_over_gpio is true) */ struct stmpe_platform_data { int id; unsigned int blocks; unsigned int irq_trigger; bool autosleep; - bool irq_over_gpio; - int irq_gpio; int autosleep_timeout; }; =20 @@ -1349,13 +1343,6 @@ static void stmpe_of_probe(struct stmpe_platform_dat= a *pdata, if (pdata->id < 0) pdata->id =3D -1; =20 - pdata->irq_gpio =3D of_get_named_gpio_flags(np, "irq-gpio", 0, - &pdata->irq_trigger); - if (gpio_is_valid(pdata->irq_gpio)) - pdata->irq_over_gpio =3D 1; - else - pdata->irq_trigger =3D IRQF_TRIGGER_NONE; - of_property_read_u32(np, "st,autosleep-timeout", &pdata->autosleep_timeout); =20 @@ -1381,6 +1368,7 @@ int stmpe_probe(struct stmpe_client_info *ci, enum st= mpe_partnum partnum) struct stmpe_platform_data *pdata; struct device_node *np =3D ci->dev->of_node; struct stmpe *stmpe; + struct gpio_desc *irq_gpio; int ret; u32 val; =20 @@ -1434,18 +1422,20 @@ int stmpe_probe(struct stmpe_client_info *ci, enum = stmpe_partnum partnum) if (ci->init) ci->init(stmpe); =20 - if (pdata->irq_over_gpio) { - ret =3D devm_gpio_request_one(ci->dev, pdata->irq_gpio, - GPIOF_DIR_IN, "stmpe"); - if (ret) { - dev_err(stmpe->dev, "failed to request IRQ GPIO: %d\n", - ret); - return ret; - } + irq_gpio =3D devm_gpiod_get_optional(ci->dev, "irq", GPIOD_ASIS); + ret =3D PTR_ERR_OR_ZERO(irq_gpio); + if (ret) { + dev_err(stmpe->dev, "failed to request IRQ GPIO: %d\n", ret); + return ret; + } =20 - stmpe->irq =3D gpio_to_irq(pdata->irq_gpio); + if (irq_gpio) { + stmpe->irq =3D gpiod_to_irq(irq_gpio); + pdata->irq_trigger =3D gpiod_is_active_low(irq_gpio) ? + IRQF_TRIGGER_LOW : IRQF_TRIGGER_HIGH; } else { stmpe->irq =3D ci->irq; + pdata->irq_trigger =3D IRQF_TRIGGER_NONE; } =20 if (stmpe->irq < 0) { --=20 2.37.2.789.g6183377224-goog --=20 Dmitry