From patchwork Fri Dec 1 09:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nam Cao X-Patchwork-Id: 172336 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp989963vqy; Fri, 1 Dec 2023 01:23:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IF8v/d6zKwvADHBElEjRM8h3AlnbPnFGS0zSd9qlqlc4KBle1BJEGaiGgLg38ztvjk0mg// X-Received: by 2002:a17:902:c244:b0:1d0:568f:3a61 with SMTP id 4-20020a170902c24400b001d0568f3a61mr737927plg.6.1701422623657; Fri, 01 Dec 2023 01:23:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701422623; cv=none; d=google.com; s=arc-20160816; b=M3lCCC2zm4pg1QU6z3wMa2cHJMXsPThjYnnLZEKtJxU/kxDfhuBb4V3ZpQJro0J+Zm jBiJVADZAOKWKb862NXmkvhbswB6DHKLGWjN5QjfQJt2Zl01eiudlzoJe+aVShlYZQlS J2M4Tw4MOYb69lO3U5mkhIRD1Kp1c3IrCnChlE/xlhL06/FqwD6aEMaE6xqSFRsc9p40 8bJ5m7zGlfSlKo6ITZZlLoZwRoUBY5QRlvxlyP5rCTJ1FqnHd/SGzoL/C6oObppeDWzP 9Wux9C7eS488JYI7obyWPULE20v+yOptDpOqgu3zYAOgR3Yq9SORrFoq8ufvzHcOA8eo tuew== 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:dkim-signature:dkim-signature:from; bh=+Dlkt5iITjDmgd8mHReFB0fl1WIjH8XvmMOEkx0Dpeg=; fh=IKK/SIZntHUrBqr6dWt/U2zb+FK4JqPWDhPbeJaAFoI=; b=O6mHISy+Gdqf6HjFBorFbLNq8l9M1nqcat+ckMNZjtr4VaPC+osF1/2zJIBZk81JFP xSFjvM/dbW5ipZMFQDtU1PpirXMVmeF42GyTXaA3HEQyEX0vHvjudUXeemq8DE2Pj6yT XwmjUL5Zzm8UGzH9zfM4oV337b5O3RloabyULfx+p8d5++aMlSGZHVPFdkSnuZiKgfY0 UwZP7ZpXFIBjBSoJ6ohr96au52vJxz0JDaFe5VBB6NhLbEiREAfkYO/TWjjZnhu/u9d1 9RZgHHGSbOLLq02ag2LtM9A+RSWJh9N6jspewayecrQwIchHmPD02VWtft1Mfx32TE9r gLVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Ei2Izo4C; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=p9a48Wwr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id n7-20020a170903110700b001cfc35d12f4si2998721plh.140.2023.12.01.01.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 01:23:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Ei2Izo4C; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=p9a48Wwr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 7596D8108374; Fri, 1 Dec 2023 01:23:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378004AbjLAJXb (ORCPT + 99 others); Fri, 1 Dec 2023 04:23:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48504 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377899AbjLAJX3 (ORCPT ); Fri, 1 Dec 2023 04:23:29 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 580CBA0; Fri, 1 Dec 2023 01:23:36 -0800 (PST) From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701422614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+Dlkt5iITjDmgd8mHReFB0fl1WIjH8XvmMOEkx0Dpeg=; b=Ei2Izo4CxRMXUkn6Bg+EApq+n5Bd54LwB0n1mGq3okEyD5fu1tOvFOlmUrKr+/p95Bg6cx LYM3Bm4Qj4x6xqJEPAkpYoU59L3Iq6PuUiWN+pjn6lcJ9AHGqUOTKcccBqK6ncEr2LFry5 Qc39YyXwjWOmsoonQ0h+vWK1zzrR2g/TqNkvV4GqNbBF2tBTAcLLVPQrLyKPPa+JP4GgoP Ha9CBX8+UHXW0ucKlZ4tVLEkFSK9msjIg5AythWrm4FbdPmVHOxYmmSZ+cXEo2yX5LI2ra 284MbaEt6egwYJ9Vi7XGQ37wOdhlrcGidqhi/7GQHm6H9Dg7lykJO/kBkEvsWA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701422614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=+Dlkt5iITjDmgd8mHReFB0fl1WIjH8XvmMOEkx0Dpeg=; b=p9a48Wwr2TRwuyNV19VS83ZkMfBM9TMBto2vTw8UP0cNLj6chlyNlbvhIu0LTZGY3yHenr MOZorrCUVNfdsUAw== To: Emil Renner Berthing , Jianlong Huang , Hal Feng , Linus Walleij , Huan Feng , Andy Shevchenko , Drew Fustini , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao , stable@vger.kernel.org Subject: [PATCH 1/2] pinctrl: starfive: jh7110: ignore disabled device tree nodes Date: Fri, 1 Dec 2023 10:23:28 +0100 Message-Id: MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 01 Dec 2023 01:23:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784070928891632303 X-GMAIL-MSGID: 1784070928891632303 The driver always registers pin configurations in device tree. This can cause some inconvenience to users, as pin configurations in the base device tree cannot be disabled in the device tree overlay, even when the relevant devices are not used. Ignore disabled pin configuration nodes in device tree. Fixes: 447976ab62c5 ("pinctrl: starfive: Add StarFive JH7110 sys controller driver") Cc: stable@vger.kernel.org Signed-off-by: Nam Cao --- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 640f827a9b2c..b4f799572689 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -135,7 +135,7 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev, int ret; ngroups = 0; - for_each_child_of_node(np, child) + for_each_available_child_of_node(np, child) ngroups += 1; nmaps = 2 * ngroups; @@ -150,7 +150,7 @@ static int jh7110_dt_node_to_map(struct pinctrl_dev *pctldev, nmaps = 0; ngroups = 0; mutex_lock(&sfp->mutex); - for_each_child_of_node(np, child) { + for_each_available_child_of_node(np, child) { int npins = of_property_count_u32_elems(child, "pinmux"); int *pins; u32 *pinmux; From patchwork Fri Dec 1 09:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nam Cao X-Patchwork-Id: 172338 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp990066vqy; Fri, 1 Dec 2023 01:24:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IGxmEN5De7PHCgOy9abCooHRj9684e5rvAiPnRbAVzn+U9YJRD9Dbfp0dHvEpeXaXP8Xrsa X-Received: by 2002:a9d:7610:0:b0:6d8:6b36:97e7 with SMTP id k16-20020a9d7610000000b006d86b3697e7mr1332375otl.21.1701422640436; Fri, 01 Dec 2023 01:24:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701422640; cv=none; d=google.com; s=arc-20160816; b=GKXhQqlGr8jIHrgy1rWhw8F0W+qBoLVvCJnH/yLqVIF6m0iOS7hcNqwCdDxtLTRWKa Dzh9gX0Fle0yncj34ULhsVJCQPH1p8GSe5+UvdsZCxRFwKZ3Zh1FanmJjgukW6GZapgl t+TPzH5JsJ9F24pw9WjPakBcZPQ1bnw58dFKRTHPBVDNcqi0S6LhU51snny0w5v0El/w DEt1Fj/mh7hgLdLR0pP8cuA2gu2O10OVNZsKsyrQYOGC4+Bxa4ohvl7lXpdXs929czcB vp3oBsaDfV01kMG80qdG2JZSsRz2wNfy9ydMOt5/4kYuGf1UBupMviPr6oL0VkUKaFVo WVzg== 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:dkim-signature :dkim-signature:from; bh=nAuB+NWb1+h9nrirqejk/RLzcirj6WRcoSRAbARMZUA=; fh=IKK/SIZntHUrBqr6dWt/U2zb+FK4JqPWDhPbeJaAFoI=; b=i8YIQdshNo90bMg93R6aeLnQhG0Nfv3GDYtfZ79xGHWA8f3LWte/UpKsyRev7QmtEN IraB7EBwPXaOPEPftba0ufiAyjPNbm3X/B1XyQll23de5tf4Ln3AkrJbKyXZ7BTOCfHs DOgzqgl4FyYKwn9JrNE5BF2LBxoMmQDSDg7v6IyHAm7VUhY7xxTHuRjfLm6FBYM6V6Z4 tSzh7AkiAxi2ru1nskwx2FVWTul8Sf2IwPZceIsEsE3Uee/0y/kT1Iwb1itYc7cXw9Aq J0sqEzYkOSFzbAYPq6x+6Qbbkzjg9WPLLrhj/XdJYfuP0ImELovhnm2erNneKatwj9f6 GpgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tGDR9eZq; dkim=neutral (no key) header.i=@linutronix.de header.b=A9ARbpvm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id y191-20020a638ac8000000b005b9b68add9asi2922133pgd.255.2023.12.01.01.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Dec 2023 01:24:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tGDR9eZq; dkim=neutral (no key) header.i=@linutronix.de header.b=A9ARbpvm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id C91658108378; Fri, 1 Dec 2023 01:23:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378009AbjLAJXc (ORCPT + 99 others); Fri, 1 Dec 2023 04:23:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377992AbjLAJXa (ORCPT ); Fri, 1 Dec 2023 04:23:30 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B37A2194; Fri, 1 Dec 2023 01:23:36 -0800 (PST) From: Nam Cao DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1701422615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nAuB+NWb1+h9nrirqejk/RLzcirj6WRcoSRAbARMZUA=; b=tGDR9eZqdwVBv7/g90Ct9HkZutigEwF7ngGXBC+BJCXQQoFHN4SZeJEcPAk1kEfZK6uhUm jev2BdKZEWpF96N55lxD2jYDQO8NnCDrFcmrDHV9VSQg2CvYF1KJoXjQS3Ih7oTZTIgTQb p+1WMxrsmgMvM6U3hx8fQKu01nBI5+XqdYV1RBPRjOQ6OHIULZ9D9NIGTKEcGo4pidOeT6 Rcq7KgFbkeumyAQzK+S8hG2IvvAI3FV21O9L9iJSbHl1tyzcnjjYNy9qJF9yxC3sQzbjGP IoepgDGclqu+dwbYuaRJr0BcAsz35D9078zP+x+vnZeL/Nr4u710h/8ErzjxSQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1701422615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nAuB+NWb1+h9nrirqejk/RLzcirj6WRcoSRAbARMZUA=; b=A9ARbpvm7QOTKyyBB7JLD1eW7y/nyFyioCc01jf3h7pElP7NZmdrLwXNwXLV59pcm5uQGw X5zAVFsE//77j/Cw== To: Emil Renner Berthing , Jianlong Huang , Hal Feng , Linus Walleij , Huan Feng , Andy Shevchenko , Drew Fustini , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Nam Cao , stable@vger.kernel.org Subject: [PATCH 2/2] pinctrl: starfive: jh7100: ignore disabled device tree nodes Date: Fri, 1 Dec 2023 10:23:29 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 01 Dec 2023 01:23:57 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784070946595035362 X-GMAIL-MSGID: 1784070946595035362 The driver always registers pin configurations in device tree. This can cause some inconvenience to users, as pin configurations in the base device tree cannot be disabled in the device tree overlay, even when the relevant devices are not used. Ignore disabled pin configuration nodes in device tree. Fixes: ec648f6b7686 ("pinctrl: starfive: Add pinctrl driver for StarFive SoCs") Cc: stable@vger.kernel.org Signed-off-by: Nam Cao --- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index 530fe340a9a1..561fd0c6b9b0 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -492,7 +492,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev, nmaps = 0; ngroups = 0; - for_each_child_of_node(np, child) { + for_each_available_child_of_node(np, child) { int npinmux = of_property_count_u32_elems(child, "pinmux"); int npins = of_property_count_u32_elems(child, "pins"); @@ -527,7 +527,7 @@ static int starfive_dt_node_to_map(struct pinctrl_dev *pctldev, nmaps = 0; ngroups = 0; mutex_lock(&sfp->mutex); - for_each_child_of_node(np, child) { + for_each_available_child_of_node(np, child) { int npins; int i;