From patchwork Fri Jan 13 21:53:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 13101685 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 33555C3DA78 for ; Fri, 13 Jan 2023 21:54:57 +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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+GD5dvnq5yHvewZRGa+OCaPXwAc1X0gDxAQVsnd0AkI=; b=tlKmMmkPXDvDQN 4HYte2ERwLoji9Kxuz3bWXpLuOvwj2oZksblIYXpsThDyjBbYWatN5KtIJSLJR/2LCe7ZX4M6gvEM K8m4N/UCE32jp1obovFtXU9q7Wrbwo+ehAmUsoqIwoTOq0LyjUb+WsQnj6Xtq6+OSFemi18GwDAQf oTCtdD2PEci6oead5XFNd4xhnJpuz3tbbcpDIVJ7k125q8H2yzJEzL0I+u9FCN3KvdZycY7UkIjgJ xELkr0q+VQGVG38sb7fv/nt3JoA7s5gvIdxH41dWmhsUyQkAAjevLc48MOhE0UrsllR0aLK7XClsa OrrH73jaUITWkDpVhxOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pGRzl-004et9-Fv; Fri, 13 Jan 2023 21:53:53 +0000 Received: from mga01.intel.com ([192.55.52.88]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pGRzZ-004eog-1C; Fri, 13 Jan 2023 21:53:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673646820; x=1705182820; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Z/1Cne1W4AwpoRsJk54/v3XiqpKeXDprBTs8fqxisP4=; b=DOOG4YTQAPjMA6h9Bg+dKnLSimGgn6rlH/2Jbs/jAR7hjG2UsK7agdpl muvoYGSiDUG4dfn5hjo2x5rdY+IYCsDrAkzkUWQg1fSymnv+LOZ0+iTXD 5AoHrOBlzbvaWcUXPWujzCvUrCaJwzFk7NWlEdhKaF9mqk7hsWPD140WU Ndfg7QVYRayvSN8dp7NwV4KGIq0FrPbbCjdFexs70RsCSwNONXVyBsAIi ZsplTUof+E7AYMH4H28K6z8SrkQsoL5P2dVRgzOrdzsll4x6M+3XtRd4y NiW6dVV2/Nvq42cohFKWsyTB5OWizbiAyMnKK41BAmTXfxYfVsIWpuq5w w==; X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="351343123" X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="351343123" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2023 13:53:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="766170869" X-IronPort-AV: E=Sophos;i="5.97,215,1669104000"; d="scan'208";a="766170869" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga002.fm.intel.com with ESMTP; 13 Jan 2023 13:53:22 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 77F46130; Fri, 13 Jan 2023 23:53:56 +0200 (EET) From: Andy Shevchenko To: Bartosz Golaszewski , Dmitry Torokhov , Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Bartosz Golaszewski , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Stefan Wahren Subject: [PATCH v3 3/4] pinctrl: bcm2835: Switch to use ->add_pin_ranges() Date: Fri, 13 Jan 2023 23:53:51 +0200 Message-Id: <20230113215352.44272-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230113215352.44272-1-andriy.shevchenko@linux.intel.com> References: <20230113215352.44272-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230113_135341_106064_82786033 X-CRM114-Status: GOOD ( 16.04 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Yeah, while the ->add_pin_ranges() shouldn't be used by DT drivers, this one requires it to support quite old firmware descriptions that do not have gpio-ranges property. The change allows to clean up GPIO library from OF specifics. There is no functional change intended. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index c7cdccdb4332..8e2551a08c37 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -358,9 +358,9 @@ static int bcm2835_gpio_direction_output(struct gpio_chip *chip, return 0; } -static int bcm2835_of_gpio_ranges_fallback(struct gpio_chip *gc, - struct device_node *np) +static int bcm2835_add_pin_ranges_fallback(struct gpio_chip *gc) { + struct device_node *np = dev_of_node(gc->parent); struct pinctrl_dev *pctldev = of_pinctrl_get(np); if (!pctldev) @@ -386,7 +386,7 @@ static const struct gpio_chip bcm2835_gpio_chip = { .base = -1, .ngpio = BCM2835_NUM_GPIOS, .can_sleep = false, - .of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback, + .add_pin_ranges = bcm2835_add_pin_ranges_fallback, }; static const struct gpio_chip bcm2711_gpio_chip = { @@ -403,7 +403,7 @@ static const struct gpio_chip bcm2711_gpio_chip = { .base = -1, .ngpio = BCM2711_NUM_GPIOS, .can_sleep = false, - .of_gpio_ranges_fallback = bcm2835_of_gpio_ranges_fallback, + .add_pin_ranges = bcm2835_add_pin_ranges_fallback, }; static void bcm2835_gpio_irq_handle_bank(struct bcm2835_pinctrl *pc,