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 ccb7addd78f47acb2993a56ef6f47aba4f1a19db..4682212eda45c1d7dbe010fa2c0a75df7ece30ad 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
+++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
@@ -190,7 +190,7 @@
 };
 
 &otg_sram {
-       status = "okay";
+       status = "disabled";
 };
 
 &pio {
@@ -278,17 +278,11 @@
        regulator-name = "avcc";
 };
 
+/*
 &reg_usb0_vbus {
        status = "okay";
 };
-
-&reg_usb1_vbus {
-       status = "okay";
-};
-
-&reg_usb2_vbus {
-       status = "okay";
-};
+*/
 
 &spi0 {
        pinctrl-names = "default";
@@ -318,7 +312,7 @@
 
 &usb_otg {
        dr_mode = "otg";
-       status = "okay";
+       status = "disabled";
 };
 
 &usb_power_supply {
@@ -326,10 +320,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 f4e7ac0886977f2e8367f8ad9e5bfa4d7d17b9b2..7a7f99fe2daebd43837f1f22e66f80ea04ed6e77 100644 (file)
--- 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";
 };