* [PATCH 1/4] arm64: dts: meson-gxl-libretech-cc: fix GPIO lines names
2018-11-07 10:45 [PATCH 0/4] arm64: dts: meson-gx: fix GPIO lines names Neil Armstrong
@ 2018-11-07 10:45 ` Neil Armstrong
2018-11-07 10:45 ` [PATCH 2/4] arm64: dts: meson-gxbb-nanopi-k2: " Neil Armstrong
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2018-11-07 10:45 UTC (permalink / raw)
To: linus-amlogic
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>
---
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 ++--
1 file 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 90a56af..b4dfb9a 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 */
"", "", "", "", "", "", "",
"", "", "", "", "", "", "",
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/4] arm64: dts: meson-gxbb-nanopi-k2: fix GPIO lines names
2018-11-07 10:45 [PATCH 0/4] arm64: dts: meson-gx: fix GPIO lines names Neil Armstrong
2018-11-07 10:45 ` [PATCH 1/4] arm64: dts: meson-gxl-libretech-cc: " Neil Armstrong
@ 2018-11-07 10:45 ` Neil Armstrong
2018-11-07 10:45 ` [PATCH 3/4] arm64: dts: meson-gxbb-odroidc2: " Neil Armstrong
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2018-11-07 10:45 UTC (permalink / raw)
To: linus-amlogic
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: 12ada0513d7a ("ARM64: dts: meson-gxbb-nanopi-k2: Add GPIO lines names")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
index cbe99bd..8cd50b7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -191,7 +191,7 @@
pinctrl-names = "default";
};
-&pinctrl_aobus {
+&gpio_ao {
gpio-line-names = "UART TX", "UART RX", "Power Control", "Power Key In",
"VCCK En", "CON1 Header Pin31",
"I2S Header Pin6", "IR In", "I2S Header Pin7",
@@ -201,7 +201,7 @@
"";
};
-&pinctrl_periphs {
+&gpio {
gpio-line-names = /* Bank GPIOZ */
"Eth MDIO", "Eth MDC", "Eth RGMII RX Clk",
"Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2",
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 3/4] arm64: dts: meson-gxbb-odroidc2: fix GPIO lines names
2018-11-07 10:45 [PATCH 0/4] arm64: dts: meson-gx: fix GPIO lines names Neil Armstrong
2018-11-07 10:45 ` [PATCH 1/4] arm64: dts: meson-gxl-libretech-cc: " Neil Armstrong
2018-11-07 10:45 ` [PATCH 2/4] arm64: dts: meson-gxbb-nanopi-k2: " Neil Armstrong
@ 2018-11-07 10:45 ` Neil Armstrong
2018-11-07 10:45 ` [PATCH 4/4] arm64: dts: meson-gxl-khadas-vim: " Neil Armstrong
2018-11-15 19:54 ` [PATCH 0/4] arm64: dts: meson-gx: " Kevin Hilman
4 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2018-11-07 10:45 UTC (permalink / raw)
To: linus-amlogic
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: b03c7d6438bb ("ARM64: dts: meson-gxbb-odroidc2: Add GPIO lines names")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index 54954b3..00f7be6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -187,7 +187,7 @@
pinctrl-names = "default";
};
-&pinctrl_aobus {
+&gpio_ao {
gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En",
"USB HUB nRESET", "USB OTG Power En",
"J7 Header Pin2", "IR In", "J7 Header Pin4",
@@ -197,7 +197,7 @@
"";
};
-&pinctrl_periphs {
+&gpio {
gpio-line-names = /* Bank GPIOZ */
"Eth MDIO", "Eth MDC", "Eth RGMII RX Clk",
"Eth RX DV", "Eth RX D0", "Eth RX D1", "Eth RX D2",
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 4/4] arm64: dts: meson-gxl-khadas-vim: fix GPIO lines names
2018-11-07 10:45 [PATCH 0/4] arm64: dts: meson-gx: fix GPIO lines names Neil Armstrong
` (2 preceding siblings ...)
2018-11-07 10:45 ` [PATCH 3/4] arm64: dts: meson-gxbb-odroidc2: " Neil Armstrong
@ 2018-11-07 10:45 ` Neil Armstrong
2018-11-15 19:54 ` [PATCH 0/4] arm64: dts: meson-gx: " Kevin Hilman
4 siblings, 0 replies; 6+ messages in thread
From: Neil Armstrong @ 2018-11-07 10:45 UTC (permalink / raw)
To: linus-amlogic
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 d32cf38..864ef01 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
@@ -112,7 +112,7 @@
linux,rc-map-name = "rc-geekbox";
};
-&pinctrl_aobus {
+&gpio_ao {
gpio-line-names = "UART TX",
"UART RX",
"Power Key In",
@@ -127,7 +127,7 @@
"";
};
-&pinctrl_periphs {
+&gpio {
gpio-line-names = /* Bank GPIOZ */
"", "", "", "", "", "", "",
"", "", "", "", "", "", "",
--
2.7.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 0/4] arm64: dts: meson-gx: fix GPIO lines names
2018-11-07 10:45 [PATCH 0/4] arm64: dts: meson-gx: fix GPIO lines names Neil Armstrong
` (3 preceding siblings ...)
2018-11-07 10:45 ` [PATCH 4/4] arm64: dts: meson-gxl-khadas-vim: " Neil Armstrong
@ 2018-11-15 19:54 ` Kevin Hilman
4 siblings, 0 replies; 6+ messages in thread
From: Kevin Hilman @ 2018-11-15 19:54 UTC (permalink / raw)
To: linus-amlogic
Neil Armstrong <narmstrong@baylibre.com> writes:
> 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 patches moves the properties to the gpio nodes for the board DT having
> the GPIO lines names.
Queued for v4.21 (branch: v4.21/dt64)
Kevin
^ permalink raw reply [flat|nested] 6+ messages in thread