ARM: dts: am335x-boneblack.dts: unique gpio-line-names

Based on linux-gpio discussion [1], it is best practice to make the
gpio-line-names unique. Generic names like "[ethernet]" are replaced
with the name of the unique signal on the AM3358 SoC ball corresponding
to the gpio line. "[NC]" is also renamed to the standard "NC" name to
represent "not connected".

[1] https://lore.kernel.org/linux-gpio/20201216195357.GA2583366@x1/

Signed-off-by: Drew Fustini <drew@beagleboard.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index b4feb85..e2ee8b8 100644 (file)
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -26,54 +26,54 @@
 
 &gpio0 {
        gpio-line-names =
-               "[ethernet]",
-               "[ethernet]",
+               "[mdio_data]",
+               "[mdio_clk]",
                "P9_22 [spi0_sclk]",
                "P9_21 [spi0_d0]",
                "P9_18 [spi0_d1]",
                "P9_17 [spi0_cs0]",
-               "[sd card]",
-               "P9_42A [ecappwm0]",
-               "P8_35 [hdmi]",
-               "P8_33 [hdmi]",
-               "P8_31 [hdmi]",
-               "P8_32 [hdmi]",
+               "[mmc0_cd]",
+               "P8_42A [ecappwm0]",
+               "P8_35 [lcd d12]",
+               "P8_33 [lcd d13]",
+               "P8_31 [lcd d14]",
+               "P8_32 [lcd d15]",
                "P9_20 [i2c2_sda]",
                "P9_19 [i2c2_scl]",
                "P9_26 [uart1_rxd]",
                "P9_24 [uart1_txd]",
-               "[ethernet]",
-               "[ethernet]",
-               "[usb]",
-               "[hdmi]",
+               "[rmii1_txd3]",
+               "[rmii1_txd2]",
+               "[usb0_drvvbus]",
+               "[hdmi cec]",
                "P9_41B",
-               "[ethernet]",
+               "[rmii1_txd1]",
                "P8_19 [ehrpwm2a]",
                "P8_13 [ehrpwm2b]",
-               "[NC]",
-               "[NC]",
+               "NC",
+               "NC",
                "P8_14",
                "P8_17",
-               "[ethernet]",
-               "[ethernet]",
+               "[rmii1_txd0]",
+               "[rmii1_refclk]",
                "P9_11 [uart4_rxd]",
                "P9_13 [uart4_txd]";
 };
 
 &gpio1 {
        gpio-line-names =
-               "P8_25 [emmc]",
-               "[emmc]",
-               "P8_5 [emmc]",
-               "P8_6 [emmc]",
-               "P8_23 [emmc]",
-               "P8_22 [emmc]",
-               "P8_3 [emmc]",
-               "P8_4 [emmc]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
+               "P8_25 [mmc1_dat0]",
+               "[mmc1_dat1]",
+               "P8_5 [mmc1_dat2]",
+               "P8_6 [mmc1_dat3]",
+               "P8_23 [mmc1_dat4]",
+               "P8_22 [mmc1_dat5]",
+               "P8_3 [mmc1_dat6]",
+               "P8_4 [mmc1_dat7]",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
                "P8_12",
                "P8_11",
                "P8_16",
@@ -82,13 +82,13 @@
                "P9_23",
                "P9_14 [ehrpwm1a]",
                "P9_16 [ehrpwm1b]",
-               "[emmc]",
+               "[emmc rst]",
                "[usr0 led]",
                "[usr1 led]",
                "[usr2 led]",
                "[usr3 led]",
-               "[hdmi]",
-               "[usb]",
+               "[hdmi irq]",
+               "[usb vbus oc]",
                "[hdmi audio]",
                "P9_12",
                "P8_26",
@@ -116,38 +116,38 @@
                "P8_38 [hdmi]",
                "P8_36 [hdmi]",
                "P8_34 [hdmi]",
-               "[ethernet]",
-               "[ethernet]",
-               "[ethernet]",
-               "[ethernet]",
+               "[rmii1_rxd3]",
+               "[rmii1_rxd2]",
+               "[rmii1_rxd1]",
+               "[rmii1_rxd0]",
                "P8_27 [hdmi]",
                "P8_29 [hdmi]",
                "P8_28 [hdmi]",
                "P8_30 [hdmi]",
-               "[emmc]",
-               "[emmc]",
-               "[emmc]",
-               "[emmc]",
-               "[emmc]",
-               "[emmc]";
+               "[mmc0_dat3]",
+               "[mmc0_dat2]",
+               "[mmc0_dat1]",
+               "[mmc0_dat0]",
+               "[mmc0_clk]",
+               "[mmc0_cmd]";
 };
 
 &gpio3 {
        gpio-line-names =
-               "[ethernet]",
-               "[ethernet]",
-               "[ethernet]",
-               "[ethernet]",
-               "[ethernet]",
-               "[i2c0]",
-               "[i2c0]",
-               "[emu]",
-               "[emu]",
-               "[ethernet]",
-               "[ethernet]",
-               "[NC]",
-               "[NC]",
-               "[usb]",
+               "[mii col]",
+               "[mii crs]",
+               "[mii rx err]",
+               "[mii tx en]",
+               "[mii rx dv]",
+               "[i2c0 sda]",
+               "[i2c0 scl]",
+               "[jtag emu0]",
+               "[jtag emu1]",
+               "[mii tx clk]",
+               "[mii rx clk]",
+               "NC",
+               "NC",
+               "[usb vbus en]",
                "P9_31 [spi1_sclk]",
                "P9_29 [spi1_d0]",
                "P9_30 [spi1_d1]",
@@ -156,14 +156,14 @@
                "P9_27",
                "P9_41A",
                "P9_25",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]",
-               "[NC]";
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC",
+               "NC";
 };