From patchwork Sat Dec 11 18:53:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Fritz X-Patchwork-Id: 12695773 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86C86C433F5 for ; Sat, 11 Dec 2021 18:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version:Date:Cc:To:From: Subject:Message-ID:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=qlQLq1EhH+feIGSsb6XMxKTGge68a3aIKM9E++wRDz0=; b=qEfpOkC+W6kR+w lXFdEC3JwmQ+sBtSegI1CAQVQqKdKD5czX48sgtDvlWi5D6HbKRImU/mcTIm94b3wB79boyyZh4rE A2fu9XjGgO41RZeWH96S1Ke7KMmEsXeKX97Y6UZw3BTbX4G3VBSse2vNP5nStf038rIpGV8sqXQ7y kTPgMgAuUwwqB1LfCugvHGLC3SRs3Eh5MX5+k1fn0p9pPvqUOuwNVh6vsqFyg4UhLiHRDxpYalDKz ou82gK48reYASILYk4cKaksGtSTkacnVqa5cqnY00F5gfijUIEnJZl7U07ZEId6Nizt/RNaGCIemJ jLTxK5ZR36Ehc/ZlrnUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mw7VJ-005P6y-KL; Sat, 11 Dec 2021 18:53:53 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mw7VG-005P6e-2p for linux-arm-kernel@lists.infradead.org; Sat, 11 Dec 2021 18:53:51 +0000 Received: by mail-wr1-x432.google.com with SMTP id t9so20298622wrx.7 for ; Sat, 11 Dec 2021 10:53:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=message-id:subject:from:reply-to:to:cc:date:user-agent:mime-version :content-transfer-encoding; bh=TWUrlcTesqI3HuTnG0bLpcjjpTZsdRdkaEZo0eKnu84=; b=fCL9nwjqyRotkVGUmDRGaxph9Ky8MEnAbUbKRK5eMmoxQy7SE9OCh5OVQFcE66Kljk AvH2OxW7k6uW+AzQmDqqAmKJ8M+gevk8Nc6hmGbV4AM+xi6kfXf3/pphzxc+B9uFwz+P 47pJ4uovEDr45okzlU37gM7i/cIUyrXNQ0SX8j2nc3DwgN0UzRPLlKPDlpRnQ4+UTy2n jTpwagJw4shutT/8DYzlGdSR5yFaS+WdDNXyeRgkZcfGNvrafQU3+KnVWFeRe9qyjoDD rKC1ZJ/Utty1edqCmXNOK3WpNp7loKq6vGq6ZQ4KAcJRS3q2Ne3MZh+eVyAtWeCBKWnf 5llw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:reply-to:to:cc:date :user-agent:mime-version:content-transfer-encoding; bh=TWUrlcTesqI3HuTnG0bLpcjjpTZsdRdkaEZo0eKnu84=; b=glFxX1Zb69kHHG2aDR+CjrDM9KfT3xTsb27n+9wHKQtrblsPFRqq6TQj0luVkoekDv giyPu8cj0BHoF3m1hLy4/b7WbIGZ/wPpvF1O0xpmBmS6tpvGHcrdHjaylzbuQ3Yl84vu 97o0Gaz1OO6wM4kLwAbGb+r5/9OdPyyZZFwNslnPi6wFGpFVVOChNtcqE9s6pqz8+er/ HOZA3aUaKsIbpwFNsze1ngIthUjK4LP4uG2ZU9gpvMv6RIkM27K+QxUrHWTU/js7Oh6U PSvbCcy0zUVg7wNGBiSV6igrIhkqpGPHNwlNSbCwQ/loVtJNXZnGpFF/lvZ0cIM7SnUl fLtQ== X-Gm-Message-State: AOAM532ge4xKWteEniUk9SZ+6WNQl5tBJrkjkflLgzvbjh3qEk4XcqLf N+trN1wjgUueEeFNoJINiKs= X-Google-Smtp-Source: ABdhPJx2knX4bKY7hBXMatBBZT+FGKyzvmJWAx1y6UenAlTIGdo8x6ppcC11ynSU11xW1h6iL4GEUA== X-Received: by 2002:a5d:6a89:: with SMTP id s9mr21980731wru.123.1639248827955; Sat, 11 Dec 2021 10:53:47 -0800 (PST) Received: from mars.fritz.box ([2a02:8070:bb0:8700:b62e:e6aa:398b:fb9d]) by smtp.gmail.com with ESMTPSA id m21sm5529538wrb.2.2021.12.11.10.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Dec 2021 10:53:47 -0800 (PST) Message-ID: Subject: [PATCH] Revert "pinctrl: stm32: fix the reported number of GPIO lines per bank" From: Christoph Fritz To: Alexandre Torgue , Maxime Coquelin , Linus Walleij Cc: Fabien Dessenne , linux-gpio@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org Date: Sat, 11 Dec 2021 19:53:39 +0100 User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211211_105350_201521_7C024ABA X-CRM114-Status: GOOD ( 11.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: chf.fritz@googlemail.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit 67e2996f72c71ebe4ac2fcbcf77e54479bb7aa11 because it breaks pin usage for gpio-nodes with an offset in gpio-ranges (like &gpiof from stm32mp15xxab-pinctrl.dtsi). For example the following reset gpio of a wifi module on a stm32mp153c board works again after applying this revert patch: wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpiof 9 GPIO_ACTIVE_LOW>; }; Signed-off-by: Christoph Fritz --- drivers/pinctrl/stm32/pinctrl-stm32.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index 24764ebcc936..73f49c596cef 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c @@ -1225,7 +1225,7 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, struct device *dev = pctl->dev; struct resource res; int npins = STM32_GPIO_PINS_PER_BANK; - int bank_nr, err, i = 0; + int bank_nr, err; if (!IS_ERR(bank->rstc)) reset_control_deassert(bank->rstc); @@ -1247,14 +1247,9 @@ static int stm32_gpiolib_register_bank(struct stm32_pinctrl *pctl, of_property_read_string(np, "st,bank-name", &bank->gpio_chip.label); - if (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, i, &args)) { + if (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, 0, &args)) { bank_nr = args.args[1] / STM32_GPIO_PINS_PER_BANK; bank->gpio_chip.base = args.args[1]; - - npins = args.args[2]; - while (!of_parse_phandle_with_fixed_args(np, "gpio-ranges", 3, - ++i, &args)) - npins += args.args[2]; } else { bank_nr = pctl->nbanks; bank->gpio_chip.base = bank_nr * STM32_GPIO_PINS_PER_BANK;