ARM: dts: bcm2835: Fix labels for GPIO 0,1

According to the schematics for all RPis with a 40 pin header,
the GPIOs 0 and 1 are labeled as ID_SD and ID_SC. In order to
clarify that is a I2C bus, append the third letter.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
index 2cd9c5e4f892865f3e52ec351ae9161064f30696..db8a6017f220a2b737b5e0af002e9b1077572f03 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -31,8 +31,8 @@ &gpio {
         * "FOO" = GPIO line named "FOO" on the schematic
         * "FOO_N" = GPIO line named "FOO" on schematic, active low
         */
-       gpio-line-names = "SDA0",
-                         "SCL0",
+       gpio-line-names = "ID_SDA",
+                         "ID_SCL",
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",

diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
index cfbdaacbaeba815cd5d1ce2a7bea50861558774a..1e40d672b05522c628e77eaf31b011f7d4341192 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -33,8 +33,8 @@ &gpio {
         * "FOO" = GPIO line named "FOO" on the schematic
         * "FOO_N" = GPIO line named "FOO" on schematic, active low
         */
-       gpio-line-names = "SDA0",
-                         "SCL0",
+       gpio-line-names = "ID_SDA",
+                         "ID_SCL",
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
index 644d907bafbb6932559b3acb73caf04f3733fe3b..5765d3411fd6f2091ae8d597ef8f92d4a0ea6b88 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -40,8 +40,8 @@ &gpio {
         * "FOO" = GPIO line named "FOO" on the schematic
         * "FOO_N" = GPIO line named "FOO" on schematic, active low
         */
-       gpio-line-names = "GPIO0",
-                         "GPIO1",
+       gpio-line-names = "ID_SDA",
+                         "ID_SCL",
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",

diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
index 00323ba8f7de5cb2aab2d0d83218790029630531..3b35a8a4a55f92afa680afcf2cd5ad9da636770b 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -28,8 +28,8 @@ &gpio {
         * "FOO" = GPIO line named "FOO" on the schematic
         * "FOO_N" = GPIO line named "FOO" on schematic, active low
         */
-       gpio-line-names = "SDA0",
-                         "SCL0",
+       gpio-line-names = "ID_SDA",
+                         "ID_SCL",
                          "SDA1",
                          "SCL1",
                          "GPIO_GCLK",