Commit 2a28a5cd authored by Stefan Wahren's avatar Stefan Wahren Committed by Florian Fainelli

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: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20230617133620.53129-2-stefan.wahren@i2se.comSigned-off-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
parent 06c2afb8
...@@ -81,6 +81,7 @@ &gpio { ...@@ -81,6 +81,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
/* I2S interface */ /* I2S interface */
......
...@@ -83,6 +83,7 @@ &gpio { ...@@ -83,6 +83,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
/* I2S interface */ /* I2S interface */
......
...@@ -83,6 +83,7 @@ &gpio { ...@@ -83,6 +83,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
/* I2S interface */ /* I2S interface */
......
...@@ -83,6 +83,7 @@ &gpio { ...@@ -83,6 +83,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
/* I2S interface */ /* I2S interface */
......
...@@ -83,6 +83,7 @@ &gpio { ...@@ -83,6 +83,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0>; pinctrl-0 = <&gpioout &alt0>;
}; };
......
...@@ -73,6 +73,7 @@ &gpio { ...@@ -73,6 +73,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0>; pinctrl-0 = <&gpioout &alt0>;
}; };
......
...@@ -97,6 +97,7 @@ &gpio { ...@@ -97,6 +97,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0>; pinctrl-0 = <&gpioout &alt0>;
}; };
...@@ -111,6 +112,7 @@ &led_act { ...@@ -111,6 +112,7 @@ &led_act {
}; };
&sdhci { &sdhci {
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
}; };
......
...@@ -85,6 +85,7 @@ &gpio { ...@@ -85,6 +85,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
/* I2S interface */ /* I2S interface */
......
...@@ -26,8 +26,6 @@ vchiq: mailbox@7e00b840 { ...@@ -26,8 +26,6 @@ vchiq: mailbox@7e00b840 {
}; };
&gpio { &gpio {
pinctrl-names = "default";
gpioout: gpioout { gpioout: gpioout {
brcm,pins = <6>; brcm,pins = <6>;
brcm,function = <BCM2835_FSEL_GPIO_OUT>; brcm,function = <BCM2835_FSEL_GPIO_OUT>;
......
...@@ -82,6 +82,7 @@ &gpio { ...@@ -82,6 +82,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
/* I2S interface */ /* I2S interface */
......
...@@ -72,6 +72,7 @@ &gpio { ...@@ -72,6 +72,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0>; pinctrl-0 = <&gpioout &alt0>;
}; };
......
...@@ -95,6 +95,7 @@ &gpio { ...@@ -95,6 +95,7 @@ &gpio {
"SD_DATA2_R", "SD_DATA2_R",
"SD_DATA3_R"; "SD_DATA3_R";
pinctrl-names = "default";
pinctrl-0 = <&gpioout &alt0>; pinctrl-0 = <&gpioout &alt0>;
}; };
...@@ -109,6 +110,7 @@ &led_act { ...@@ -109,6 +110,7 @@ &led_act {
}; };
&sdhci { &sdhci {
pinctrl-names = "default";
pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment