ARM: dts: bcm2835-rpi-b: Fix GPIO line names

[ Upstream commit 97bd8659c1c46c23e4daea7e040befca30939950 ]

Recently this has been fixed in the vendor tree, so upstream this.

Fixes: 731b26a6ac17 ("ARM: bcm2835: Add names for the Raspberry Pi GPIO lines")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts
index 31ff602e2cd3644a5524443dbc817023852c01a9..6bac18d7c07097c0a152261b476f2880910868d9 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -48,18 +48,17 @@
                          "GPIO18",
                          "NC", /* GPIO19 */
                          "NC", /* GPIO20 */
-                         "GPIO21",
+                         "CAM_GPIO0",
                          "GPIO22",
                          "GPIO23",
                          "GPIO24",
                          "GPIO25",
                          "NC", /* GPIO26 */
-                         "CAM_GPIO0",
-                         /* Binary number representing build/revision */
-                         "CONFIG0",
-                         "CONFIG1",
-                         "CONFIG2",
-                         "CONFIG3",
+                         "GPIO27",
+                         "GPIO28",
+                         "GPIO29",
+                         "GPIO30",
+                         "GPIO31",
                          "NC", /* GPIO32 */
                          "NC", /* GPIO33 */
                          "NC", /* GPIO34 */