projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-usb
[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..3081afca0e28befb2ccb50ee41dfc238de18a8ab 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;
/* 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)
{
static int sunxi_musb_enable(struct musb *musb)
{
@@
-320,13
+321,15
@@
int musb_usb_probe(struct udevice *dev)
priv->desc_before_addr = true;
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);
(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");
ret = musb_lowlevel_init(host);
if (ret == 0)
printf("MUSB OTG\n");