ARM: bcm2835: Fix names for the Raspberry Pi GPIO lines
authorStefan Wahren <stefan.wahren@i2se.com>
Wed, 16 Nov 2016 17:52:06 +0000 (17:52 +0000)
committerEric Anholt <eric@anholt.net>
Wed, 16 Nov 2016 21:54:30 +0000 (13:54 -0800)
There are some differences between the schematics and the official firmware
DTS [1]. So based on these additional information the following has been
changed:

* use consistent "CAM_GPIO1" for camera LED
* use consistent "CAM_GPIO0" for camera shutdown
* add "USB_LIMIT" for USB current limit (0=600mA, 1=1200mA)

[1] - https://github.com/raspberrypi/firmware/blob/master/extra/dt-blob.dts

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
arch/arm/boot/dts/bcm2835-rpi-a.dts
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
arch/arm/boot/dts/bcm2835-rpi-b.dts

index 5a22c7965f349fe1e6dd1bf77c8330d016c473bb..d0704540db6b3cc136bd92dfb3038077d8083312 100644 (file)
                          "SCL0",
                          "NC", /* GPIO30 */
                          "NC", /* GPIO31 */
-                         "NC", /* GPIO32 */
+                         "CAM_GPIO1", /* GPIO32 */
                          "NC", /* GPIO33 */
                          "NC", /* GPIO34 */
                          "PWR_LOW_N", /* GPIO35 */
                          "NC", /* GPIO36 */
                          "NC", /* GPIO37 */
-                         "NC", /* GPIO38 */
+                         "USB_LIMIT", /* GPIO38 */
                          "NC", /* GPIO39 */
                          "PWM0_OUT", /* GPIO40 */
                          "CAM_GPIO0", /* GPIO41 */
index 54f98c59a75d0077b318e6f32042546fcda508a6..46d078e29017eeda2ea5d92c6d0c21d1ce9deccd 100644 (file)
@@ -29,7 +29,7 @@
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",
-                         "CAM_CLK",
+                         "CAM_GPIO1",
                          "LAN_RUN",
                          "SPI_CE1_N",
                          "SPI_CE0_N",
@@ -52,7 +52,7 @@
                          "GPIO24",
                          "GPIO25",
                          "NC", /* GPIO26 */
-                         "CAM_GPIO",
+                         "CAM_GPIO0",
                          /* Binary number representing build/revision */
                          "CONFIG0",
                          "CONFIG1",
index b67587e6cbefddc8f5a79a79f7f36e4c903decfa..432088ebb0a19a97e5390a3c90f88af9f796476d 100644 (file)
@@ -71,7 +71,7 @@
                          "PWR_LOW_N", /* GPIO35 */
                          "NC", /* GPIO36 */
                          "NC", /* GPIO37 */
-                         "NC", /* GPIO38 */
+                         "USB_LIMIT", /* GPIO38 */
                          "NC", /* GPIO39 */
                          "PWM0_OUT", /* GPIO40 */
                          "CAM_GPIO0", /* GPIO41 */
index 71f50e16c646e0413de594391e870854761bb778..4d56fe3006b0c38b652d88b36af09306ea455b2e 100644 (file)
@@ -30,7 +30,7 @@
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",
-                         "CAM_CLK",
+                         "CAM_GPIO1",
                          "LAN_RUN",
                          "SPI_CE1_N",
                          "SPI_CE0_N",
@@ -53,7 +53,7 @@
                          "GPIO24",
                          "GPIO25",
                          "NC", /* GPIO26 */
-                         "CAM_GPIO",
+                         "CAM_GPIO0",
                          /* Binary number representing build/revision */
                          "CONFIG0",
                          "CONFIG1",