Merge branch 'master' of git://git.denx.de/u-boot-ubi

[oweals/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 be1d2ec8e41c39aa67c5089a397aa663f2f5e998..c016a0bb544dd82a86a6a6dfe780d58c5bcc426f 100644 (file)
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -201,6 +201,7 @@ 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)
 {
@@ -320,13 +321,15 @@ int musb_usb_probe(struct udevice *dev)
 
        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)
-                       return -EIO;
        }
 
+       host->host = sunxi_musb;
+       if (!host->host)
+               return -EIO;
+
        ret = musb_lowlevel_init(host);
        if (ret == 0)
                printf("MUSB OTG\n");
@@ -337,9 +340,16 @@ int musb_usb_probe(struct udevice *dev)
 int musb_usb_remove(struct udevice *dev)
 {
        struct musb_host_data *host = dev_get_priv(dev);
+       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
 
        musb_stop(host->host);
 
+       sunxi_usb_phy_exit(0);
+#ifdef CONFIG_SUNXI_GEN_SUN6I
+       clrbits_le32(&ccm->ahb_reset0_cfg, 1 << AHB_GATE_OFFSET_USB0);
+#endif
+       clrbits_le32(&ccm->ahb_gate0, 1 << AHB_GATE_OFFSET_USB0);
+
        return 0;
 }