Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stefan Wahren and committed by
Florian Fainelli
2a28a5cd 06c2afb8

+13 -2
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-a-plus.dts
··· 81 81 "SD_DATA2_R", 82 82 "SD_DATA3_R"; 83 83 84 + pinctrl-names = "default"; 84 85 pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 85 86 86 87 /* I2S interface */
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-a.dts
··· 83 83 "SD_DATA2_R", 84 84 "SD_DATA3_R"; 85 85 86 + pinctrl-names = "default"; 86 87 pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; 87 88 88 89 /* I2S interface */
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-b-plus.dts
··· 83 83 "SD_DATA2_R", 84 84 "SD_DATA3_R"; 85 85 86 + pinctrl-names = "default"; 86 87 pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 87 88 88 89 /* I2S interface */
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-b-rev2.dts
··· 83 83 "SD_DATA2_R", 84 84 "SD_DATA3_R"; 85 85 86 + pinctrl-names = "default"; 86 87 pinctrl-0 = <&gpioout &alt0 &i2s_alt2>; 87 88 88 89 /* I2S interface */
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-b.dts
··· 83 83 "SD_DATA2_R", 84 84 "SD_DATA3_R"; 85 85 86 + pinctrl-names = "default"; 86 87 pinctrl-0 = <&gpioout &alt0>; 87 88 }; 88 89
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-cm1-io1.dts
··· 73 73 "SD_DATA2_R", 74 74 "SD_DATA3_R"; 75 75 76 + pinctrl-names = "default"; 76 77 pinctrl-0 = <&gpioout &alt0>; 77 78 }; 78 79
+2
arch/arm/boot/dts/broadcom/bcm2835-rpi-zero-w.dts
··· 97 97 "SD_DATA2_R", 98 98 "SD_DATA3_R"; 99 99 100 + pinctrl-names = "default"; 100 101 pinctrl-0 = <&gpioout &alt0>; 101 102 }; 102 103 ··· 112 111 }; 113 112 114 113 &sdhci { 114 + pinctrl-names = "default"; 115 115 pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; 116 116 }; 117 117
+1
arch/arm/boot/dts/broadcom/bcm2835-rpi-zero.dts
··· 85 85 "SD_DATA2_R", 86 86 "SD_DATA3_R"; 87 87 88 + pinctrl-names = "default"; 88 89 pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 89 90 90 91 /* I2S interface */
-2
arch/arm/boot/dts/broadcom/bcm2835-rpi.dtsi
··· 26 26 }; 27 27 28 28 &gpio { 29 - pinctrl-names = "default"; 30 - 31 29 gpioout: gpioout { 32 30 brcm,pins = <6>; 33 31 brcm,function = <BCM2835_FSEL_GPIO_OUT>;
+1
arch/arm/boot/dts/broadcom/bcm2836-rpi-2-b.dts
··· 82 82 "SD_DATA2_R", 83 83 "SD_DATA3_R"; 84 84 85 + pinctrl-names = "default"; 85 86 pinctrl-0 = <&gpioout &alt0 &i2s_alt0>; 86 87 87 88 /* I2S interface */
+1
arch/arm/boot/dts/broadcom/bcm2837-rpi-cm3-io3.dts
··· 72 72 "SD_DATA2_R", 73 73 "SD_DATA3_R"; 74 74 75 + pinctrl-names = "default"; 75 76 pinctrl-0 = <&gpioout &alt0>; 76 77 }; 77 78
+2
arch/arm/boot/dts/broadcom/bcm2837-rpi-zero-2-w.dts
··· 95 95 "SD_DATA2_R", 96 96 "SD_DATA3_R"; 97 97 98 + pinctrl-names = "default"; 98 99 pinctrl-0 = <&gpioout &alt0>; 99 100 }; 100 101 ··· 110 109 }; 111 110 112 111 &sdhci { 112 + pinctrl-names = "default"; 113 113 pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>; 114 114 }; 115 115