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-spi
[oweals/u-boot.git]
/
drivers
/
usb
/
musb-new
/
musb_regs.h
diff --git
a/drivers/usb/musb-new/musb_regs.h
b/drivers/usb/musb-new/musb_regs.h
index 27e4ed4ec6a3257b9e49f8b416fa90c758e32d74..90288c46949dc30a1f19a2de15d1431322fd0f35 100644
(file)
--- a/
drivers/usb/musb-new/musb_regs.h
+++ b/
drivers/usb/musb-new/musb_regs.h
@@
-458,8
+458,13
@@
static inline u8 musb_read_ulpi_buscontrol(void __iomem *mbase)
static inline u8 musb_read_configdata(void __iomem *mbase)
{
static inline u8 musb_read_configdata(void __iomem *mbase)
{
+#ifdef CONFIG_MACH_SUN8I_A33
+ /* <Sigh> allwinner saves a reg, and we need to hardcode this */
+ return 0xde;
+#else
musb_writeb(mbase, MUSB_INDEX, 0);
return musb_readb(mbase, 0x10 + MUSB_CONFIGDATA);
musb_writeb(mbase, MUSB_INDEX, 0);
return musb_readb(mbase, 0x10 + MUSB_CONFIGDATA);
+#endif
}
static inline u16 musb_read_hwvers(void __iomem *mbase)
}
static inline u16 musb_read_hwvers(void __iomem *mbase)