41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From db194607c28989a307f60f2fd89a4996b6ae4f02 Mon Sep 17 00:00:00 2001
|
|
From: Neil Armstrong <narmstrong@baylibre.com>
|
|
Date: Wed, 7 Nov 2018 11:45:50 +0100
|
|
Subject: [PATCH 28/53] arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names
|
|
|
|
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: 60795933b709 ("ARM64: dts: meson-gxl-khadas-vim: Add GPIO lines names")
|
|
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
|
|
---
|
|
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
|
index e5ef9b0b91c1..1a4b3f3b8ace 100644
|
|
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
|
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
|
|
@@ -158,7 +158,7 @@
|
|
linux,rc-map-name = "rc-geekbox";
|
|
};
|
|
|
|
-&pinctrl_aobus {
|
|
+&gpio_ao {
|
|
gpio-line-names = "UART TX",
|
|
"UART RX",
|
|
"Power Key In",
|
|
@@ -173,7 +173,7 @@
|
|
"";
|
|
};
|
|
|
|
-&pinctrl_periphs {
|
|
+&gpio {
|
|
gpio-line-names = /* Bank GPIOZ */
|
|
"", "", "", "", "", "", "",
|
|
"", "", "", "", "", "", "",
|
|
--
|
|
2.17.1
|
|
|