musb: sunxi: Do not allocate musb struct multiple times

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

diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 6109011dca092cf5bebec1289050008fe0404372..3081afca0e28befb2ccb50ee41dfc238de18a8ab 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -14,11 +14,7 @@
  *
  * This file is part of the Inventra Controller Driver for Linux.
  *
- * The Inventra Controller Driver for Linux is free software; you
- * can redistribute it and/or modify it under the terms of the GNU
- * General Public License version 2 as published by the Free Software
- * Foundation.
- *
+ * SPDX-License-Identifier:    GPL-2.0
  */
 #include <common.h>
 #include <asm/arch/cpu.h>
@@ -165,6 +161,17 @@ static void USBC_ConfigFIFO_Base(void)
        writel(reg_value, SUNXI_SRAMC_BASE + 0x04);
 }
 
+/******************************************************************************
+ * Needed for the DFU polling magic
+ ******************************************************************************/
+
+static u8 last_int_usb;
+
+bool dfu_usb_get_reset(void)
+{
+       return !!(last_int_usb & MUSB_INTR_RESET);
+}
+
 /******************************************************************************
  * MUSB Glue code
  ******************************************************************************/
@@ -176,6 +183,7 @@ static irqreturn_t sunxi_musb_interrupt(int irq, void *__hci)
 
        /* read and flush interrupts */
        musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB);
+       last_int_usb = musb->int_usb;
        if (musb->int_usb)
                musb_writeb(musb->mregs, MUSB_INTRUSB, musb->int_usb);
        musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX);
@@ -193,13 +201,15 @@ static irqreturn_t sunxi_musb_interrupt(int irq, void *__hci)
 
 /* musb_core does not call enable / disable in a balanced manner <sigh> */
 static bool enabled = false;
+static struct musb *sunxi_musb;
 
 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;
 
@@ -207,17 +217,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);
@@ -233,9 +252,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 */
 
@@ -286,7 +302,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,
@@ -296,26 +312,29 @@ static struct musb_hdrc_platform_data musb_plat = {
        .platform_ops   = &sunxi_musb_ops,
 };
 
-#ifdef CONFIG_MUSB_HOST
+#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,
+       if (!sunxi_musb) {
+               sunxi_musb = musb_init_controller(&musb_plat, NULL,
                                                  (void *)SUNXI_USB0_BASE);
-               if (!host->host) {
-                       printf("Failed to init the controller\n");
-                       return -EIO;
-               }
        }
 
-       printf("MUSB OTG in host-mode\n");
+       host->host = sunxi_musb;
+       if (!host->host)
+               return -EIO;
+
+       ret = musb_lowlevel_init(host);
+       if (ret == 0)
+               printf("MUSB OTG\n");
 
-       return musb_lowlevel_init(host);
+       return ret;
 }
 
 int musb_usb_remove(struct udevice *dev)
@@ -340,7 +359,7 @@ U_BOOT_DRIVER(usb_musb) = {
 
 void sunxi_musb_board_init(void)
 {
-#ifdef CONFIG_MUSB_HOST
+#ifdef CONFIG_USB_MUSB_HOST
        struct udevice *dev;
 
        /*