From a1fb73d7da4355afff91552f0efe743c4ecb7ac5 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Mon, 2 Oct 2017 16:21:29 +0200 Subject: [PATCH] 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 Cc: Alex Elder Cc: Peter Griffin Signed-off-by: Linus Walleij Signed-off-by: Wei Xu --- .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts index b9142871d6fe..a6fd13389f8d 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts @@ -78,17 +78,17 @@ eth_phy1: phy@3 { &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 @@ &gpio3 { 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 @@ &gpio5 { status = "okay"; gpio-line-names = "", "USER-LED-1", "USER-LED-2", "", - "", "LS-GPIO-A", + "", "GPIO-A", "", ""; }; -- 2.45.2