ARM: dts: bcm283x: Fix pinctrl groups

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 <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20230617133620.53129-2-stefan.wahren@i2se.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts
index 02ce817868ba76d2c15fcdb824d81a83583d1047..069b48272aa52c54d798618f7100245c87f4a720 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts
@@ -81,6 +81,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts
index 3fdf60eb11dc9d01a75fb3da1f6f2a6bb1e5ed56..2726c00431e86bce1ceb0ded79062f789f8b96b3 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts
@@ -83,6 +83,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
 
        /* I2S interface */

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts
index 9956fd06a4b6393273a3cb21db596189398610f5..c57b999a452025c01f115849be7d75b55222fbee 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts
@@ -83,6 +83,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts
index 4e1770afb145d5676df461ef9daa1866672c689c..ae6d3a9586ab5b7819fca2fab40b3463aac5e5a2 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts
@@ -83,6 +83,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
 
        /* I2S interface */

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts
index eec1d0892d332b197d528700e325f9ec3b3ecd40..72764be75a799d2072cd4dcb7564e3f34b684b12 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts
@@ -83,6 +83,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0>;
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts
index 87958a96c3e0ce08d96c5dbb15aee9bfc6ed900b..3f9d198ac3ab19bacf711bd2da1d887e9633fc0d 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts
@@ -73,6 +73,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0>;
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts
index dbf825985ec0b8e73c9f2c9d1e31f9d2dd13a57b..1f0b163e400cd3b32652d41551da2c02573a9b1c 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts
@@ -97,6 +97,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0>;
 };
 
@@ -111,6 +112,7 @@
 };
 
 &sdhci {
+       pinctrl-names = "default";
        pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts
index f80e65a825fd61a519c850b69dcef33d799dd4c4..539c19c10946c1eb0a362fedf4b1319ce40c7953 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts
@@ -85,6 +85,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */

diff --git a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
index ee9ee9d1fe654a550c834fea27ae8085bf92506c..f0acc9390f317c16d7fa148be4861a7eb2269d72 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
@@ -26,8 +26,6 @@
 };
 
 &gpio {
-       pinctrl-names = "default";
-
        gpioout: gpioout {
                brcm,pins = <6>;
                brcm,function = <BCM2835_FSEL_GPIO_OUT>;

diff --git a/arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts
index 6068ec3900817eccb53149ec09ce93abf7ee43c5..79918033750e506f29a9e871ed8f36cd82a86421 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts
@@ -82,6 +82,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 
        /* I2S interface */

diff --git a/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
index cf84e69fced8312eb91cad2e0f47214f710ba412..72d26d130efaa435f4255df3774d8a46a109c8cb 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
@@ -72,6 +72,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0>;
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts b/arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts
index b9cc4594398b1990071fd249206803671d7a0d54..85cf594724eff905e90e986395ccdea6f555ce40 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts
+++ b/arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts
@@ -95,6 +95,7 @@
                          "SD_DATA2_R",
                          "SD_DATA3_R";
 
+       pinctrl-names = "default";
        pinctrl-0 = <&gpioout &alt0>;
 };
 
@@ -109,6 +110,7 @@
 };
 
 &sdhci {
+       pinctrl-names = "default";
        pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
 };