From 3b70763ca0fc8b9c60bbc7e48a8d08f1a59b60e8 Mon Sep 17 00:00:00 2001
From: Martin Ayotte <martinayotte@yahoo.ca>
Date: Thu, 9 May 2019 12:01:05 -0400
Subject: [PATCH] fix general-add-H6-UARTs patch

---
 .../sunxi-dev/general-add-H6-UARTs.patch      | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch b/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch
index 0114196516..3c6eff7cd8 100644
--- a/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch
+++ b/patch/kernel/sunxi-dev/general-add-H6-UARTs.patch
@@ -19,14 +19,20 @@ index c72da8c..41a057e 100644
  		};
  
  		uart0: serial@5000000 {
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-index 4d8ca45..f05c995 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
-@@ -242,6 +242,12 @@
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+index b2526da..f31e14d 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+@@ -197,6 +201,18 @@
  	status = "okay";
  };
  
++&uart2 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart2_pins>;
++	status = "disabled";
++};
++
 +&uart3 {
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&uart3_pins>;
@@ -34,22 +40,5 @@ index 4d8ca45..f05c995 100644
 +};
 +
  &usb2otg {
- 	dr_mode = "host";
- 	status = "okay";
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
-index 4d8ca45..f05c995 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
-@@ -242,6 +242,12 @@
- 	status = "okay";
- };
- 
-+&uart3 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&uart3_pins>;
-+	status = "disabled";
-+};
-+
- &usb2otg {
- 	dr_mode = "host";
+ 	dr_mode = "otg";
  	status = "okay";