From patchwork Sun Jun 4 12:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 13266559 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14845C87FF1 for ; Sun, 4 Jun 2023 12:13:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231766AbjFDMN2 (ORCPT ); Sun, 4 Jun 2023 08:13:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231767AbjFDMN0 (ORCPT ); Sun, 4 Jun 2023 08:13:26 -0400 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2BD4DA; Sun, 4 Jun 2023 05:13:21 -0700 (PDT) Received: from stefanw-SCHENKER ([37.4.248.58]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MhCq4-1qbFSl2eSw-00eKob; Sun, 04 Jun 2023 14:12:41 +0200 From: Stefan Wahren To: Vinod Koul , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Florian Fainelli , Ray Jui , Scott Branden , Jassi Brar , Thierry Reding , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-mmc@vger.kernel.org, linux-pwm@vger.kernel.org, linux-pm@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, Stefan Wahren Subject: [PATCH 01/10] ARM: dts: bcm283x: Fix pinctrl groups Date: Sun, 4 Jun 2023 14:12:14 +0200 Message-Id: <20230604121223.9625-2-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230604121223.9625-1-stefan.wahren@i2se.com> References: <20230604121223.9625-1-stefan.wahren@i2se.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:mtzdiXupiX0ovDKR8B8yDc2fLnJzi43B8Dsh4J4sOEKiULWkTTn 21MxBFA/WKcvAqXuqRaH7D8tvDBPKX9eN3Q4hSg9JcOKBkA2jrLvTSSrtQw1A6rh7PG+uoz Ykh/DN2oN3DhWH2dqW5k2eqk1W+KkCc8416zC1h21fnPy9/4Ioxli67eTM25e1mnCbmtzLz XXn1jRIP12T9C70ob4yEg== UI-OutboundReport: notjunk:1;M01:P0:19IxGm0NZyI=;bXhGtj99J7VscELeKYfg0pEPwHs APRgJKH51UJ9UAumVw8LFZsteNeVZya7wafl0wcbaFZbX8CUB0q87L792O91WUS75ImGFF6Y7 8Z+lCM5BknA10sM/QeSf/BcjSvSZJ3e2fXe/Ruy3tJ+zoL9uAxf4Dd4jIEe6Zy7d/gG5dVecl cwT+FKALhMbfBloseooPsZl8p1Zpvzo995Z+Iue0mj3fq9HOF/3pZQUhxrWqs1qer0qDuqs41 HApqgPzEb2UTBljZOUvhnxB8CgQsyLlB1RnfKsFAbci1UG57xi8FoAYQSTimqOrAzt7JsU7Fi v8674/PXCzaUtRCrUVLjMmJBub0KazhM8P6wFyvPifxaokqI5hbPfnsq797KbToiXSB8AKu1c g3DlTigW4OyZoteEHHa0PUybVblIIfGWyTARnTitp+NFgJhHA4f4qpc4vE8i7WAyFjB+zqTPf P5MKXe3a5x7TxMN7fspjn6uSJwlaIVLGFMgmf87xFLqdLhmLJGyf1r8aAmyDP1nFVSRBE2oRw buTQcXJ0lcXnRBC22oUAe957rvPC0Pl213DCJdSrE2fEfiE9JTtfa9S7eulX4P8zWaq2Ph+0p 7irSvBlAZjx0nVylA7p178gbi1HimL0h2+27Aju6AChFBV7Bwg+KF6gdbeh/P2jyLrkmmGYkh K7Z85+naPoQ3Cs13TU6yf4tHW6pWURVtMuOwAbfgyQ== Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org Currently the dtbs_check for bcm2837 generates warnings like this: gpio@7e200000: 'pinctrl-0' is a dependency of 'pinctrl-names' This is caused by the definition of pinctrl-names without matching pinctrl group and vice versa. So defining both at the same place make the dts files easier to review. Signed-off-by: Stefan Wahren --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-a.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 ++ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 1 + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 -- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts | 2 ++ 12 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts index 02ce817868ba..069b48272aa5 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -81,6 +81,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; /* I2S interface */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts index 3fdf60eb11dc..2726c00431e8 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -83,6 +83,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; /* I2S interface */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts index 9956fd06a4b6..c57b999a4520 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -83,6 +83,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; /* I2S interface */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts index 4e1770afb145..ae6d3a9586ab 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -83,6 +83,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; /* I2S interface */ diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index eec1d0892d33..72764be75a79 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -83,6 +83,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts index 87958a96c3e0..3f9d198ac3ab 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts @@ -73,6 +73,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts index dbf825985ec0..1f0b163e400c 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -97,6 +97,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0>; }; @@ -111,6 +112,7 @@ &led_act { }; &sdhci { + pinctrl-names = "default"; pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts index f80e65a825fd..539c19c10946 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -85,6 +85,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; /* I2S interface */ diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index ee9ee9d1fe65..f0acc9390f31 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -26,8 +26,6 @@ vchiq: mailbox@7e00b840 { }; &gpio { - pinctrl-names = "default"; - gpioout: gpioout { brcm,pins = <6>; brcm,function = ; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index 6068ec390081..79918033750e 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -82,6 +82,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; /* I2S interface */ diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts index cf84e69fced8..72d26d130efa 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts @@ -72,6 +72,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0>; }; diff --git a/arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts b/arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts index b9cc4594398b..85cf594724ef 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-zero-2-w.dts @@ -95,6 +95,7 @@ &gpio { "SD_DATA2_R", "SD_DATA3_R"; + pinctrl-names = "default"; pinctrl-0 = <&gpioout &alt0>; }; @@ -109,6 +110,7 @@ &led_act { }; &sdhci { + pinctrl-names = "default"; pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; };