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-net
[oweals/u-boot.git]
/
drivers
/
usb
/
musb-new
/
musb_dsps.c
diff --git
a/drivers/usb/musb-new/musb_dsps.c
b/drivers/usb/musb-new/musb_dsps.c
index 9a03917e87d6ffb169cdb19715123c616ca24547..895939773a7cdb389ea06551a70e54afb8831c02 100644
(file)
--- a/
drivers/usb/musb-new/musb_dsps.c
+++ b/
drivers/usb/musb-new/musb_dsps.c
@@
-29,7
+29,6
@@
* da8xx.c would be merged to this file after testing.
*/
* da8xx.c would be merged to this file after testing.
*/
-#define __UBOOT__
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/io.h>
#ifndef __UBOOT__
#include <linux/init.h>
#include <linux/io.h>
@@
-157,7
+156,11
@@
struct dsps_glue {
/**
* dsps_musb_enable - enable interrupts
*/
/**
* dsps_musb_enable - enable interrupts
*/
+#ifndef __UBOOT__
static void dsps_musb_enable(struct musb *musb)
static void dsps_musb_enable(struct musb *musb)
+#else
+static int dsps_musb_enable(struct musb *musb)
+#endif
{
#ifndef __UBOOT__
struct device *dev = musb->controller;
{
#ifndef __UBOOT__
struct device *dev = musb->controller;
@@
-182,6
+185,8
@@
static void dsps_musb_enable(struct musb *musb)
if (is_otg_enabled(musb))
dsps_writel(reg_base, wrp->coreintr_set,
(1 << wrp->drvvbus) << wrp->usb_shift);
if (is_otg_enabled(musb))
dsps_writel(reg_base, wrp->coreintr_set,
(1 << wrp->drvvbus) << wrp->usb_shift);
+#else
+ return 0;
#endif
}
#endif
}