From patchwork Thu Jan 12 16:38:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 42643 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp3989087wrt; Thu, 12 Jan 2023 08:54:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXvMJl+zbiI8dOUWqVy1m/Kx2m3SzWHbWaJnxqT8jiztOzAaktOPnK1joBlMsPldS4X22iWm X-Received: by 2002:a17:90b:4a45:b0:226:102:2dc9 with SMTP id lb5-20020a17090b4a4500b0022601022dc9mr59447931pjb.14.1673542474491; Thu, 12 Jan 2023 08:54:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673542474; cv=none; d=google.com; s=arc-20160816; b=fN2NNDDpVi9KUUvbJdskqyL9U33q1WFpipoircAmlk1sLEfHkAcMZmk3ARmpXtyYfI gsqPt/G+f8oCyaq0J80Eci5MGI/mj3a5iEMeqHw9tCzU0ufwSw69WnM72vqbq0/T6E25 g3mNGoCYe7SzY+/IsYpkPXIvzUcIuSKPlFODHd+Y+OGtDkMly8vD6nrVpZDBslYCmx+5 Dywarzy52BkUC8vmrVgDvkgX83IS5HfsZtWVhRmUA3f2Sy8ZFyA3Iv6kTDQJWav/RDAW 7F32ghnG+9QN7EZpjFb/iyhMEYH9AUgD0/Oba4quH+Qctx32z+DagHccNbk5Sfz4E2w+ fgow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Icx8J595Sge0zuAsoOR0ndg25eIzEQJtIUJbwwTOy5M=; b=mP7dZfEwHv8C1aEhJHm5YWNAF01j4FQuT9y3d/Pb+BwhsxMVUKUZj6hioq+KJz+u15 jyKNXorEiItnCEbjCyoeTPXHH7E53fad0qVBlBd3JgNUvMUT+eqf+qZrRNE+eTx37wmD 9Q+9zNKiAv20o7LtXW8kJIz3hSqhcKUcN9VW7nLoro5Q5jg+2pK64hvPMPt88GX83XVk T5WnIVRfph0qJCt9ZrSm/yoGOcxX+LvMqNNOeGKfbeVFIgVjwh3m7PUP1TNvTLE75H19 Pz04C4WzZw/pCnqavlwi6Z4yeJJ+4xffSmwOc47T3UCpIuO3TatrgJ6agQcAUi/ENs0Y fJCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Zll/R+8E"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y68-20020a633247000000b00478ea44f124si17906812pgy.96.2023.01.12.08.54.21; Thu, 12 Jan 2023 08:54:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="Zll/R+8E"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241333AbjALQtv (ORCPT + 99 others); Thu, 12 Jan 2023 11:49:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241262AbjALQoj (ORCPT ); Thu, 12 Jan 2023 11:44:39 -0500 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF69E58834; Thu, 12 Jan 2023 08:38:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673541505; x=1705077505; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=68OPSiZVY1KVbajcXwUGWj+MRV19nF/DUDmqYU0Aj6I=; b=Zll/R+8E+ITOdeBMGhDfdNMkYX22wjgLCWKYmyt+hOgbYklUU5dSO4VL Kri2Y374BRL6l5iLHu+a1VZzoNILj6nRX6hX2W9nyNGmdn38cRh19ecJg AdU79KTaHgw8XRGAFSixlsWHgjLYvhnOhLtODTxjytBjz+KJvKSVfHlk6 YwMNG2ah77SRUOoexV3X6X3xbcL5eTBkj2GIR+uQytYuNYx3778Z09c/r hZgSQCI3NKm6B2aLuOGsKyoOVjmJM44bkrJS8TU6AftDExKwy7Q0Z2XOz Qge3XjP3eV/JPMdQB8Ql2xF800AKfK1ea6020fDC2Dq2TD/iEphwsZhyK A==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="304132438" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="304132438" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 08:38:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690193082" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690193082" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 08:37:58 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E3D71E1; Thu, 12 Jan 2023 18:38:31 +0200 (EET) From: Andy Shevchenko To: Bartosz Golaszewski , Dmitry Torokhov , Linus Walleij , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org Cc: Bartosz Golaszewski , Florian Fainelli , Ray Jui , Scott Branden , Broadcom internal kernel review list , Andy Shevchenko Subject: [PATCH v1 1/2] pinctrl: bcm: bcm2835: Switch to use ->add_pin_ranges() Date: Thu, 12 Jan 2023 18:38:24 +0200 Message-Id: <20230112163825.72983-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754836473926206482?= X-GMAIL-MSGID: =?utf-8?q?1754836473926206482?= 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 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 7857e612a100..fea1d1bcb389 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -358,16 +358,18 @@ 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 bcm2835_pinctrl *pc = gpiochip_get_data(gc); + struct device_node *np = dev_of_node(&gc->gpiodev->dev); struct pinctrl_dev *pctldev = of_pinctrl_get(np); - of_node_put(np); - if (!pctldev) return 0; + if (of_property_read_bool(np, "gpio-ranges")) + return 0; + gpiochip_add_pin_range(gc, pinctrl_dev_get_devname(pctldev), 0, 0, gc->ngpio); @@ -388,7 +390,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 = { @@ -405,7 +407,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,