From patchwork Fri Jan 13 17:10:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 43448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp387003wrt; Fri, 13 Jan 2023 09:15:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXvtS/Yyzg+a/Q8DomCjpYwZ66CqGgEAHwqkjrlQCMxd1O0gox203/X+duQWwdd/vpJ40EH3 X-Received: by 2002:a17:906:8492:b0:7c1:6b46:a722 with SMTP id m18-20020a170906849200b007c16b46a722mr70777016ejx.56.1673630119480; Fri, 13 Jan 2023 09:15:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673630119; cv=none; d=google.com; s=arc-20160816; b=EEztRLmTBVi0YoJRI86vTRmwNnJh9OkjaHcNwEJIbqavpGJ7zpQ1aPeGB/Z4y/tJiK oGz207ItEMH1nJrGZ8bKJ4Q95JG4cFm8qr8vkbWyccjta79JdCeb19nDYFUu7pYkc2TX LI9VYodumvX9CbyxEw8yAD3ObCMJUPllI9IeVSYJ7ri9X9YSanuBark5sKcdZgmZk+pj act4NwTiTZRUXUU6NjF5I04WDBE7RFKtTo+MAN/cYIttXWuV/j9tuJyj4z7QshPOSOOR rN3VStT6zW0tvg0hAjeXL/2QSugOtWBGRkrHeXZo8wL9623knQO8aiF52pSaGnGcK5S6 +RgA== 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=JQVTvpTvw4pPHdH4hQE2iTGLCaDZsY6Pj6FW7NrvY7U=; b=KD4N+sDB/KxPipS93ln6uEUfXPDowZ44NM4FKklr9/SgNFywJI6071+rmuXHBC963f R5z9LQUVxh/FUolF0dbR9oGBeCheTyjABp4+Jmlmf7YMBTxJSbXM+WFFikCgMcbtbVyO PX/UWRWNtzjwTXgO2EqoCPDQtK6YNVJ6q8ofmvdbh5Qe8JSu5ChHHbZU6uHyhXbhbjVC frmalZ6jpXhE1LLQIFt6WeyIR/aaRJu0SesMmELZ4bdzap0HHbAADuiScCYQbb7t1XpS VnNFqKwysV1wevFsnXilkDbNjvUB45k2rp5ZQN2EgbYkfoFPpl7P018y7wAr8qxsUYgI OlHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=HYVoq4Aq; 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 dn14-20020a17090794ce00b007c11b897491si26576180ejc.833.2023.01.13.09.14.55; Fri, 13 Jan 2023 09:15:19 -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=HYVoq4Aq; 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 S230022AbjAMROB (ORCPT + 99 others); Fri, 13 Jan 2023 12:14:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbjAMRNe (ORCPT ); Fri, 13 Jan 2023 12:13:34 -0500 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 501048B51C; Fri, 13 Jan 2023 09:12:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673629923; x=1705165923; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=4czDnVSkFSUSOJn9OForI+BzEj1U5wZMtWZ0AIG6g9Q=; b=HYVoq4AqX0YHOGHgr5y+jAi7BMgkNFiGwLzJxGY2r312mBVyUH6qAXDR LgGW8zo3kl3tnUQEIEbQ92tJ66AbAZM6N/UO8nIcKPe/VAUD8URZGAMUI vDqifRE5m/yXNPeGGJfR8lPMxxa63Ds5hzE/Pb4SPYp2uVel4hUCEhVE2 DldV3YA0Wx3yel9OE4obfzMoFd+u8X3W4O3T4YvEunZSZ22hsYxC1dxeJ X65GQFz11Vfk1nxIIMBjEBMKg/BJq49TYRp3fanHz/YbK+p9r94E6mRQX QUVKWvkpKN8dJEJEDbV4sYpBoz3AwOrdZOszxTOxe32ow+ywzD5bPCSTB g==; X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="322742816" X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="322742816" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2023 09:10:22 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="608221583" X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="608221583" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 13 Jan 2023 09:10:18 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7C93AE1; Fri, 13 Jan 2023 19:10:52 +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 , Broadcom internal kernel review list , Ray Jui , Scott Branden , Stefan Wahren , Andy Shevchenko Subject: [PATCH v2 1/2] pinctrl: bcm: bcm2835: Switch to use ->add_pin_ranges() Date: Fri, 13 Jan 2023 19:10:50 +0200 Message-Id: <20230113171051.19309-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?1754928376463387668?= X-GMAIL-MSGID: =?utf-8?q?1754928376463387668?= 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 --- v2: fixed compilation issues (LKP), Cc'ed to the author of original code Btw, the commit d2b67744fd99 ("pinctrl: bcm2835: implement hook for missing gpio-ranges") seems problematic in the fist place due to odd of_node_put() call. I dunno how that part had been tested, or how it's supposed to work, i.e. where is the counterpart of_node_get(). Anyway this change drops it for good. Perhaps we can check gpio-ranges property presence inside the GPIO library, so this ->add_pin_ranges() won't be called at all. Also I would like to understand the dance around checking for pin control device. The original commit lacks of comments in the non-trivial code. drivers/pinctrl/bcm/pinctrl-bcm2835.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c index 7857e612a100..29f278c49103 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -358,16 +358,17 @@ 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); - 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 +389,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 +406,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, From patchwork Fri Jan 13 17:10: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: 43482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp392191wrt; Fri, 13 Jan 2023 09:26:43 -0800 (PST) X-Google-Smtp-Source: AMrXdXs3A4TmGL2s4/a8sIc5dmChgFz49jfQQYWi+EcHAJjaAmAsDnvPOcGCwWmwKjqUxSlWt2zl X-Received: by 2002:a05:6402:f1b:b0:499:1ed2:6455 with SMTP id i27-20020a0564020f1b00b004991ed26455mr21187508eda.17.1673630803335; Fri, 13 Jan 2023 09:26:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673630803; cv=none; d=google.com; s=arc-20160816; b=xClZPnsbxc6H+bScsby00Wvk86zn/SXAGWLPX/Hx61Hu3JH7f5QUsRk7Tm9eHO/ZgB LjNou3tpsHLe5QSg6XVRXnWNi5v/KLiA73Ge4x+QHn724qtXgytA00gAr560kpHks4LX lBNOf5UUccd5uYoMjczdIPMq9uW5tiQFFshvKEDmROLgHsPFnEEJQkkGJTMNgrZS3eH3 m9dW4WQgZ6gacSrNnOkR5/TWXB05xZySLLhJbwB09AhMS27D73H/l/wwWPlacpfXwIEc WISAFlvWGzswxFYO7Ca64ugSO4KDVAjrYqJJxfxnfln0SCXV/RHRqrYIadzCWA5YQJZ9 f1Dg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=B4zzGUYDtdQH52kIG5ro81vOSZ+zuE2T8DiLZxoNHsA=; b=NdUA3JXX4s/s/HshRBc5PJ89v39MmXMEd9lEiFSWPNoY017PBzNwXE8Xow9FZYBhmQ uTKx46UEHJQJYMjA3D826/BKh+DFaUBGZv8Sg84XkVOz4qdGMdSKMHa7n05YN+g4eZFZ 5u6a/LBqf80Krno0aiBXteecfrsjhtulKudPm/tDjdUBWXPH4BF6Y4LyrS2ysaXVf8KJ 7qQJax7IAyaISBJ7CBDIesXDYlaXSCDodqMK0OotogkC6Pfiy+EA8ypnRsgRbVMS6M4u h7pA39ks2tte82EIWdeFV1J64Vs4DtfcuZTa1GEsExr3oAMavJ7MYnT6JT1b4y10wsoz ekSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=F5VvlyjH; 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 y13-20020a50eb0d000000b0047338d1bfcfsi21098194edp.166.2023.01.13.09.26.17; Fri, 13 Jan 2023 09:26:43 -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=F5VvlyjH; 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 S230482AbjAMRZK (ORCPT + 99 others); Fri, 13 Jan 2023 12:25:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231184AbjAMRXr (ORCPT ); Fri, 13 Jan 2023 12:23:47 -0500 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32CFFA41E0; Fri, 13 Jan 2023 09:14:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673630079; x=1705166079; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X8stOTJGnm5tBQ17hxvmLP0ufU3YgC/jbWgKibzqyBQ=; b=F5VvlyjH9/uVcSJ8isNoNBceJwIhETUNuGtaqAbsgq/tUR7Ff7hIljzb gHWy7YQIiTYjx0+yUPCoDR+rA0pw/i8jUQckVcaCoR/rxZEpsXnYbXQHq JOjd1gzntiSDm1fVDTDsChcBwwdNxT+VaPlmEKKhTe8JYjDrHs/KPXWQz AieiU/3fVTlagltyP2z3f2hHD5aYKNpuK6V2O1pgkKX9EwsdahITQJbae Vflsx4K4UxJmHg/ClP6moerC718OVjp7P9yGHdHau73Qu5Ieu4ADETNTF eKSo8iN4SrWCjWnc85QSouofIEOssjRJQ3Klon5fykL1FVSwl72bNdDXP A==; X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="326101567" X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="326101567" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jan 2023 09:10:24 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10589"; a="903625125" X-IronPort-AV: E=Sophos;i="5.97,214,1669104000"; d="scan'208";a="903625125" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 13 Jan 2023 09:10:18 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 8741F92; Fri, 13 Jan 2023 19:10:52 +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 , Broadcom internal kernel review list , Ray Jui , Scott Branden , Stefan Wahren , Andy Shevchenko Subject: [PATCH v2 2/2] Revert "gpiolib: of: Introduce hook for missing gpio-ranges" Date: Fri, 13 Jan 2023 19:10:51 +0200 Message-Id: <20230113171051.19309-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230113171051.19309-1-andriy.shevchenko@linux.intel.com> References: <20230113171051.19309-1-andriy.shevchenko@linux.intel.com> 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?1754929093139808047?= X-GMAIL-MSGID: =?utf-8?q?1754929093139808047?= This reverts commit 3550bba25d5587a701e6edf20e20984d2ee72c78. No users for this one, revert it for good. The ->add_pin_ranges() can be used instead. Signed-off-by: Andy Shevchenko Acked-by: Bartosz Golaszewski --- v2: made it as a pure revert drivers/gpio/gpiolib-of.c | 5 ----- include/linux/gpio/driver.h | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 72d8a3da31e3..266352b1a966 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -980,11 +980,6 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) if (!np) return 0; - if (!of_property_read_bool(np, "gpio-ranges") && - chip->of_gpio_ranges_fallback) { - return chip->of_gpio_ranges_fallback(chip, np); - } - group_names = of_find_property(np, group_names_propname, NULL); for (;; index++) { diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index ddc7a14a274f..5ab50ba3c309 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h @@ -521,18 +521,6 @@ struct gpio_chip { */ int (*of_xlate)(struct gpio_chip *gc, const struct of_phandle_args *gpiospec, u32 *flags); - - /** - * @of_gpio_ranges_fallback: - * - * Optional hook for the case that no gpio-ranges property is defined - * within the device tree node "np" (usually DT before introduction - * of gpio-ranges). So this callback is helpful to provide the - * necessary backward compatibility for the pin ranges. - */ - int (*of_gpio_ranges_fallback)(struct gpio_chip *gc, - struct device_node *np); - #endif /* CONFIG_OF_GPIO */ };