sunxi: usb-phy: Never power off the usb ports

[karo-tx-uboot.git] / drivers / usb / musb-new / sunxi.c

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index cbd2954c41f99695d0192c942cf0ac14d5b99d80..a146c0861fffd5145cc3de314c37e909b20f6cff 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -26,9 +26,12 @@
 #include <asm/arch/gpio.h>
 #include <asm/arch/usb_phy.h>
 #include <asm-generic/gpio.h>
+#include <dm/lists.h>
+#include <dm/root.h>
 #include <linux/usb/musb.h>
 #include "linux-compat.h"
 #include "musb_core.h"
+#include "musb_uboot.h"
 
 /******************************************************************************
  ******************************************************************************
@@ -193,10 +196,11 @@ static bool enabled = false;
 
 static int sunxi_musb_enable(struct musb *musb)
 {
-       int ret;
-
        pr_debug("%s():\n", __func__);
 
+       musb_ep_select(musb->mregs, 0);
+       musb_writeb(musb->mregs, MUSB_FADDR, 0);
+
        if (enabled)
                return 0;
 
@@ -204,17 +208,26 @@ static int sunxi_musb_enable(struct musb *musb)
        musb_writeb(musb->mregs, USBC_REG_o_VEND0, 0);
 
        if (is_host_enabled(musb)) {
-               ret = sunxi_usb_phy_vbus_detect(0);
-               if (ret) {
-                       printf("A charger is plugged into the OTG: ");
-                       return -ENODEV;
+               int id = sunxi_usb_phy_id_detect(0);
+
+               if (id == 1 && sunxi_usb_phy_power_is_on(0))
+                       sunxi_usb_phy_power_off(0);
+
+               if (!sunxi_usb_phy_power_is_on(0)) {
+                       int vbus = sunxi_usb_phy_vbus_detect(0);
+                       if (vbus == 1) {
+                               printf("A charger is plugged into the OTG: ");
+                               return -ENODEV;
+                       }
                }
-               ret = sunxi_usb_phy_id_detect(0);
-               if (ret == 1) {
+
+               if (id == 1) {
                        printf("No host cable detected: ");
                        return -ENODEV;
                }
-               sunxi_usb_phy_power_on(0); /* port power on */
+
+               if (!sunxi_usb_phy_power_is_on(0))
+                       sunxi_usb_phy_power_on(0);
        }
 
        USBC_ForceVbusValidToHigh(musb->mregs);
@@ -230,9 +243,6 @@ static void sunxi_musb_disable(struct musb *musb)
        if (!enabled)
                return;
 
-       if (is_host_enabled(musb))
-               sunxi_usb_phy_power_off(0); /* port power off */
-
        USBC_ForceVbusValidToLow(musb->mregs);
        mdelay(200); /* Wait for the current session to timeout */
 
@@ -283,7 +293,7 @@ static struct musb_hdrc_config musb_config = {
 };
 
 static struct musb_hdrc_platform_data musb_plat = {
-#if defined(CONFIG_MUSB_HOST)
+#if defined(CONFIG_USB_MUSB_HOST)
        .mode           = MUSB_HOST,
 #else
        .mode           = MUSB_PERIPHERAL,
@@ -293,7 +303,62 @@ static struct musb_hdrc_platform_data musb_plat = {
        .platform_ops   = &sunxi_musb_ops,
 };
 
+#ifdef CONFIG_USB_MUSB_HOST
+int musb_usb_probe(struct udevice *dev)
+{
+       struct musb_host_data *host = dev_get_priv(dev);
+       struct usb_bus_priv *priv = dev_get_uclass_priv(dev);
+       int ret;
+
+       priv->desc_before_addr = true;
+
+       if (!host->host) {
+               host->host = musb_init_controller(&musb_plat, NULL,
+                                                 (void *)SUNXI_USB0_BASE);
+               if (!host->host)
+                       return -EIO;
+       }
+
+       ret = musb_lowlevel_init(host);
+       if (ret == 0)
+               printf("MUSB OTG\n");
+
+       return ret;
+}
+
+int musb_usb_remove(struct udevice *dev)
+{
+       struct musb_host_data *host = dev_get_priv(dev);
+
+       musb_stop(host->host);
+
+       return 0;
+}
+
+U_BOOT_DRIVER(usb_musb) = {
+       .name   = "sunxi-musb",
+       .id     = UCLASS_USB,
+       .probe = musb_usb_probe,
+       .remove = musb_usb_remove,
+       .ops    = &musb_usb_ops,
+       .platdata_auto_alloc_size = sizeof(struct usb_platdata),
+       .priv_auto_alloc_size = sizeof(struct musb_host_data),
+};
+#endif
+
 void sunxi_musb_board_init(void)
 {
+#ifdef CONFIG_USB_MUSB_HOST
+       struct udevice *dev;
+
+       /*
+        * Bind the driver directly for now as musb linux kernel support is
+        * still pending upstream so our dts files do not have the necessary
+        * nodes yet. TODO: Remove this as soon as the dts nodes are in place
+        * and bind by compatible instead.
+        */
+       device_bind_driver(dm_root(), "sunxi-musb", "sunxi-musb", &dev);
+#else
        musb_register(&musb_plat, NULL, (void *)SUNXI_USB0_BASE);
+#endif
 }