diff options
author | Stefan Wahren <stefan.wahren@i2se.com> | 2022-04-11 22:01:41 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-14 18:11:40 +0200 |
commit | 7f287d0c7001f1174d408d891e5060bc6e51077b (patch) | |
tree | 76bc842eb50402c8225186047555cb9e982fe491 | |
parent | 3a37022d48a5510af31a33c007c6c6556c8ed71e (diff) | |
download | linux-stable-7f287d0c7001f1174d408d891e5060bc6e51077b.tar.gz linux-stable-7f287d0c7001f1174d408d891e5060bc6e51077b.tar.bz2 linux-stable-7f287d0c7001f1174d408d891e5060bc6e51077b.zip |
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>
-rw-r--r-- | arch/arm/boot/dts/bcm2835-rpi-b.dts | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts index 2b69957e0113..1838e0fa0ff5 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -53,18 +53,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 */ |