usb: dwc3: dwc3-omap: make dwc3-omap build in uboot

[u-boot] / drivers / usb / musb-new / sunxi.c

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index fe45db1e064fc1e5398e5ea824e612531eee40f8..90aaec60d51e2a1dde5da5fd13ba87561baa1681 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -27,6 +27,15 @@
 #include <asm-generic/gpio.h>
 #include "linux-compat.h"
 #include "musb_core.h"
+#ifdef CONFIG_AXP152_POWER
+#include <axp152.h>
+#endif
+#ifdef CONFIG_AXP209_POWER
+#include <axp209.h>
+#endif
+#ifdef CONFIG_AXP221_POWER
+#include <axp221.h>
+#endif
 
 /******************************************************************************
  ******************************************************************************
@@ -228,29 +237,44 @@ static int sunxi_musb_init(struct musb *musb)
 
        if (is_host_enabled(musb)) {
                int vbus_det = sunxi_name_to_gpio(CONFIG_USB0_VBUS_DET);
-               if (vbus_det == -1) {
-                       eprintf("Error invalid Vusb-det pin\n");
-                       return -EINVAL;
-               }
 
-               err = gpio_request(vbus_det, "vbus0_det");
-               if (err)
-                       return err;
+#ifdef AXP_VBUS_DETECT
+               if (!strcmp(CONFIG_USB0_VBUS_DET, "axp_vbus_detect")) {
+                       err = axp_get_vbus();
+                       if (err < 0)
+                               return err;
+               } else {
+#endif
+                       if (vbus_det == -1) {
+                               eprintf("Error invalid Vusb-det pin\n");
+                               return -EINVAL;
+                       }
+
+                       err = gpio_request(vbus_det, "vbus0_det");
+                       if (err)
+                               return err;
+
+                       err = gpio_direction_input(vbus_det);
+                       if (err) {
+                               gpio_free(vbus_det);
+                               return err;
+                       }
+
+                       err = gpio_get_value(vbus_det);
+                       if (err < 0) {
+                               gpio_free(vbus_det);
+                               return -EIO;
+                       }
 
-               err = gpio_direction_input(vbus_det);
-               if (err) {
                        gpio_free(vbus_det);
-                       return err;
+#ifdef AXP_VBUS_DETECT
                }
+#endif
 
-               err = gpio_get_value(vbus_det);
                if (err) {
                        eprintf("Error: A charger is plugged into the OTG\n");
-                       gpio_free(vbus_det);
                        return -EIO;
                }
-
-               gpio_free(vbus_det);
        }
 
        err = sunxi_usbc_request_resources(0);