From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 3 Jun 2021 15:57:37 +0000 (+0200)
Subject: sunxi: dts: fix usb on Lamobo R1 and BananaPi M1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1795b9073730b14b39b9aa231ba5e7cd1997cc5b;p=people%2Farne_f%2Fkernel.git

sunxi: dts: fix usb on Lamobo R1 and BananaPi M1

somewhere is a bug in the OTG port code. If this is enabled no usb port is working.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
index 64ce00ffabea4..7fae987e101d1 100644
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -189,7 +189,7 @@
 };
 
 &otg_sram {
-	status = "okay";
+	status = "disabled";
 };
 
 &pio {
@@ -277,17 +277,11 @@
 	regulator-name = "avcc";
 };
 
+/*
 &reg_usb0_vbus {
 	status = "okay";
 };
-
-&reg_usb1_vbus {
-	status = "okay";
-};
-
-&reg_usb2_vbus {
-	status = "okay";
-};
+*/
 
 &spi0 {
 	pinctrl-names = "default";
@@ -317,7 +311,7 @@
 
 &usb_otg {
 	dr_mode = "otg";
-	status = "okay";
+	status = "disabled";
 };
 
 &usb_power_supply {
@@ -325,10 +319,9 @@
 };
 
 &usbphy {
-	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
-	usb0_vbus_power-supply = <&usb_power_supply>;
-	usb0_vbus-supply = <&reg_usb0_vbus>;
-	usb1_vbus-supply = <&reg_usb1_vbus>;
-	usb2_vbus-supply = <&reg_usb2_vbus>;
+//	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
+//	usb0_vbus_power-supply = <&usb_power_supply>;
+//	usb0_vbus-supply = <&reg_usb0_vbus>;
+	/* USB host ports (usb1 and 2) are always connected to vcc (+5v) */
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 7947bbef2a02a..481e4eb9ed04b 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -225,7 +225,7 @@
 };
 
 &otg_sram {
-	status = "okay";
+	status = "disabled";
 };
 
 #include "axp209.dtsi"
@@ -268,11 +268,15 @@
 	regulator-name = "avcc";
 };
 
+/*
 &reg_usb0_vbus {
 	status = "okay";
 };
+*/
 
 &reg_usb2_vbus {
+	/* Not really the power but connected to the WAKE pin
+	   of the wlan module */
 	gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */
 	status = "okay";
 };
@@ -305,17 +309,21 @@
 
 &usb_otg {
 	dr_mode = "otg";
-	status = "okay";
+	status = "disabled";
 };
 
+/*
 &usb_power_supply {
 	status = "okay";
 };
+*/
 
 &usbphy {
-	usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
-	usb0_vbus_power-supply = <&usb_power_supply>;
-	usb0_vbus-supply = <&reg_usb0_vbus>;
+	//usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
+	//usb0_vbus_power-supply = <&usb_power_supply>;
+	//usb0_vbus-supply = <&reg_usb0_vbus>;
+	/* USB host port (usb1) is connected to vcc (+5v) */
+	/* USB2 is connected to the wlan board */
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
 };