From 76a61a0d1ec376d1283f1219f3012b16e6f64195 Mon Sep 17 00:00:00 2001
From: Martin Ayotte <martinayotte@yahoo.ca>
Date: Tue, 7 Jan 2020 13:01:07 -0500
Subject: [PATCH] fix fix-usb1-vbus-opiwin.patch and re-enable it

---
 ...n.patch.disabled => fix-usb1-vbus-opiwin.patch} | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)
 rename patch/u-boot/u-boot-sunxi/{fix-usb1-vbus-opiwin.patch.disabled => fix-usb1-vbus-opiwin.patch} (87%)

diff --git a/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch.disabled b/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch
similarity index 87%
rename from patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch.disabled
rename to patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch
index 18436a503e..261ac44193 100644
--- a/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch.disabled
+++ b/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch
@@ -38,8 +38,8 @@ index cf76c35..a7d36a5 100644
  };
  
  &ehci1 {
-@@ -83,6 +96,13 @@
-        status = "okay";
+@@ -180,6 +222,13 @@
+ 	status = "okay";
  };
  
 +&pio {
@@ -49,14 +49,6 @@ index cf76c35..a7d36a5 100644
 +	};
 +};
 +
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_pins_a>;
-@@ -198,6 +198,7 @@
- };
- 
- &usbphy {
-+	usb1_vbus-supply = <&reg_usb1_vbus>;
+ &r_rsb {
  	status = "okay";
- };