diff options
author | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-04-10 19:55:08 -0400 |
commit | 7e8f270292ebacb25f366181f2022c819e5c7586 (patch) | |
tree | 841cf474e29eedf6c173da8d1901d3b24d06ecbd /drivers/usb/musb-new/sunxi.c | |
parent | e16e137c377c8b96d8d91263d0b6d8470169f841 (diff) | |
parent | 192eab9357473e09218e0a4448b220d691d9d886 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/musb-new/sunxi.c')
-rw-r--r-- | drivers/usb/musb-new/sunxi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/usb/musb-new/sunxi.c b/drivers/usb/musb-new/sunxi.c index be1d2ec8e4..3081afca0e 100644 --- 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"); |