mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
remove useless patch for 5.0.y
This commit is contained in:
parent
d25d7f8048
commit
cae9f254b7
2 changed files with 0 additions and 74 deletions
|
@ -1,37 +0,0 @@
|
|||
From 14466201e92e694b3003ecaec84c21c3a4cf0ffc Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Wed, 7 Nov 2018 11:45:49 +0100
|
||||
Subject: [PATCH] arm64: dts: meson-gxbb-odroidc2: 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: 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 7b89a474d460..88b859a20640 100644
|
||||
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
|
||||
@@ -224,7 +224,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",
|
||||
@@ -234,7 +234,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",
|
|
@ -1,37 +0,0 @@
|
|||
From 4afb31d23de7839ac264743fd52cbd1290686418 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Armstrong <narmstrong@baylibre.com>
|
||||
Date: Wed, 7 Nov 2018 11:45:50 +0100
|
||||
Subject: [PATCH] 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 a0eec9d165dc..f8851113e8e8 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
|
||||
@@ -150,7 +150,7 @@
|
||||
linux,rc-map-name = "rc-geekbox";
|
||||
};
|
||||
|
||||
-&pinctrl_aobus {
|
||||
+&gpio_ao {
|
||||
gpio-line-names = "UART TX",
|
||||
"UART RX",
|
||||
"Power Key In",
|
||||
@@ -165,7 +165,7 @@
|
||||
"";
|
||||
};
|
||||
|
||||
-&pinctrl_periphs {
|
||||
+&gpio {
|
||||
gpio-line-names = /* Bank GPIOZ */
|
||||
"", "", "", "", "", "", "",
|
||||
"", "", "", "", "", "", "",
|
Loading…
Add table
Add a link
Reference in a new issue