From 36a8e132a7d0610e6e1b8827eea445f474b260b8 Mon Sep 17 00:00:00 2001
From: Bryan Wu <cooloney@kernel.org>
Date: Tue, 2 Dec 2008 21:33:46 +0200
Subject: [PATCH] --- yaml --- r: 127271 b: refs/heads/master c:
 2c557a4a98be67ea54dfd0e8497050a24b7311c6 h: refs/heads/master i:   127269:
 e6e7f96b605314c1f68cbf683df83f24defb1c68   127267:
 c9e3df649415046362a690999f3d512eb546a317   127263:
 a0a5c1274ccb643c13bdc77809a1fb8069d66a98 v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/usb/musb/musb_io.h | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 916775e57e4b..e4c02cbcffc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d426e60dbf6aa2c3199e37a59c6d134eb204d628
+refs/heads/master: 2c557a4a98be67ea54dfd0e8497050a24b7311c6
diff --git a/trunk/drivers/usb/musb/musb_io.h b/trunk/drivers/usb/musb/musb_io.h
index 223f0a514094..15f057722b64 100644
--- a/trunk/drivers/usb/musb/musb_io.h
+++ b/trunk/drivers/usb/musb/musb_io.h
@@ -56,6 +56,8 @@ static inline void writesb(const void __iomem *addr, const void *buf, int len)
 
 #endif
 
+#ifndef CONFIG_BLACKFIN
+
 /* NOTE:  these offsets are all in bytes */
 
 static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
@@ -114,4 +116,26 @@ static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
 
 #endif	/* CONFIG_USB_TUSB6010 */
 
+#else
+
+static inline u8 musb_readb(const void __iomem *addr, unsigned offset)
+	{ return (u8) (bfin_read16(addr + offset)); }
+
+static inline u16 musb_readw(const void __iomem *addr, unsigned offset)
+	{ return bfin_read16(addr + offset); }
+
+static inline u32 musb_readl(const void __iomem *addr, unsigned offset)
+	{ return (u32) (bfin_read16(addr + offset)); }
+
+static inline void musb_writeb(void __iomem *addr, unsigned offset, u8 data)
+	{ bfin_write16(addr + offset, (u16) data); }
+
+static inline void musb_writew(void __iomem *addr, unsigned offset, u16 data)
+	{ bfin_write16(addr + offset, data); }
+
+static inline void musb_writel(void __iomem *addr, unsigned offset, u32 data)
+	{ bfin_write16(addr + offset, (u16) data); }
+
+#endif /* CONFIG_BLACKFIN */
+
 #endif