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 02ce817..069b482 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 3fdf60e..2726c00 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 9956fd0..c57b999 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 4e1770a..ae6d3a9 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 eec1d08..72764be 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 87958a9..3f9d198 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 dbf8259..1f0b163 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 f80e65a..539c19c 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 ee9ee9d..f0acc93 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 6068ec3..7991803 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 cf84e69..72d26d1 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 b9cc459..85cf594 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>;
 };