diff options
author | Neil Armstrong <narmstrong@baylibre.com> | 2018-11-07 11:45:47 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-13 08:52:12 +0100 |
commit | e99194333f3c48406e8b1cb41dd2da05b248e4d3 (patch) | |
tree | b6e3fb50493b33d46a64cd751163d3387becc22a /arch | |
parent | 9cd0da478f1d65e43b15f83bcba1bfa0098a7b41 (diff) | |
download | linux-stable-e99194333f3c48406e8b1cb41dd2da05b248e4d3.tar.gz linux-stable-e99194333f3c48406e8b1cb41dd2da05b248e4d3.tar.bz2 linux-stable-e99194333f3c48406e8b1cb41dd2da05b248e4d3.zip |
arm64: dts: meson-gxl-libretech-cc: fix GPIO lines names
[ Upstream commit 11fa9774612decea87144d7f950a9c53a4fe3050 ]
The gpio line names were set in the pinctrl node instead of the gpio node,
at the time it was merged, it worked, but was obviously wrong.
This patch moves the properties to the gpio nodes.
Fixes: 47884c5c746e ("ARM64: dts: meson-gxl-libretech-cc: Add GPIO lines names")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts index 90a56af967a7..b4dfb9afdef8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts @@ -163,7 +163,7 @@ }; }; -&pinctrl_aobus { +&gpio_ao { gpio-line-names = "UART TX", "UART RX", "Blue LED", @@ -178,7 +178,7 @@ "7J1 Header Pin15"; }; -&pinctrl_periphs { +&gpio { gpio-line-names = /* Bank GPIOZ */ "", "", "", "", "", "", "", "", "", "", "", "", "", "", |