arm64: dts: hisilicon: Standardize Poplar GPIO line names

The hi6220-HiKey board started to name GPIO lines for
96boards, using just the plain names "GPIO-A" etc from the
96boards specification.

Poplar started to use an arbitrary "LS-GPIO-A" (etc) prefix
that is not part of the 96boards specification.

As the former notation arrived first, and we need
consistency among 96board, rectify the Poplar board to use
this too. This is important for userspace that wants to
look up GPIO names from these strings.

Cc: Jiancheng Xue <xuejiancheng@hisilicon.com>
Cc: Alex Elder <elder@linaro.org>
Cc: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>

diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
index b9142871d6fee7c4a4994a1ebfa7a6114ed5fb82..a6fd13389f8d1547677381e958dec93fdc45f397 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
@@ -78,17 +78,17 @@
 
 &gpio1 {
        status = "okay";
-       gpio-line-names = "LS-GPIO-E",  "",
+       gpio-line-names = "GPIO-E",     "",
                          "",           "",
-                         "",           "LS-GPIO-F",
-                         "",           "LS-GPIO-J";
+                         "",           "GPIO-F",
+                         "",           "GPIO-J";
 };
 
 &gpio2 {
        status = "okay";
-       gpio-line-names = "LS-GPIO-H",  "LS-GPIO-I",
-                         "LS-GPIO-L",  "LS-GPIO-G",
-                         "LS-GPIO-K",  "",
+       gpio-line-names = "GPIO-H",     "GPIO-I",
+                         "GPIO-L",     "GPIO-G",
+                         "GPIO-K",     "",
                          "",           "";
 };
 
@@ -96,15 +96,15 @@
        status = "okay";
        gpio-line-names = "",           "",
                          "",           "",
-                         "LS-GPIO-C",  "",
-                         "",           "LS-GPIO-B";
+                         "GPIO-C",     "",
+                         "",           "GPIO-B";
 };
 
 &gpio4 {
        status = "okay";
        gpio-line-names = "",           "",
                          "",           "",
-                         "",           "LS-GPIO-D",
+                         "",           "GPIO-D",
                          "",           "";
 };
 
@@ -112,7 +112,7 @@
        status = "okay";
        gpio-line-names = "",           "USER-LED-1",
                          "USER-LED-2", "",
-                         "",           "LS-GPIO-A",
+                         "",           "GPIO-A",
                          "",           "";
 };