summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-12 12:52:33 -0400
committerTom Rini <trini@konsulko.com>2016-06-12 12:52:33 -0400
commit672a45e828039c20e5165af95623554bdc31862d (patch)
tree5d79e136c39e99d79da470abe309c350c1ece289 /drivers
parentb10335009667fee493fbce59bbeb0504d0ca9ff0 (diff)
parent1a83fb4a17d959d7b037999ab7ed7e62429abe34 (diff)
downloadblackbird-obmc-uboot-672a45e828039c20e5165af95623554bdc31862d.tar.gz
blackbird-obmc-uboot-672a45e828039c20e5165af95623554bdc31862d.zip
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/musb-new/sunxi.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c
index 3081afca0e..c016a0bb54 100644
--- a/drivers/usb/musb-new/sunxi.c
+++ b/drivers/usb/musb-new/sunxi.c
@@ -340,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;
}
OpenPOWER on IntegriCloud