Title: [8252] trunk/drivers/usb/musb: musb: tweak blackfin version hardcoding per upstream
- Revision
- 8252
- Author
- vapier
- Date
- 2010-01-28 20:27:04 -0500 (Thu, 28 Jan 2010)
Log Message
musb: tweak blackfin version hardcoding per upstream
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_core.h (8251 => 8252)
--- trunk/drivers/usb/musb/musb_core.h 2010-01-29 00:21:21 UTC (rev 8251)
+++ trunk/drivers/usb/musb/musb_core.h 2010-01-29 01:27:04 UTC (rev 8252)
@@ -328,6 +328,7 @@
#define MUSB_HWVERS_1300 0x52C
#define MUSB_HWVERS_1400 0x590
#define MUSB_HWVERS_1800 0x720
+#define MUSB_HWVERS_1900 0x784
#define MUSB_HWVERS_2000 0x800
u16 hwvers;
Modified: trunk/drivers/usb/musb/musb_regs.h (8251 => 8252)
--- trunk/drivers/usb/musb/musb_regs.h 2010-01-29 00:21:21 UTC (rev 8251)
+++ trunk/drivers/usb/musb/musb_regs.h 2010-01-29 01:27:04 UTC (rev 8252)
@@ -462,10 +462,11 @@
static inline u16 musb_read_hwvers(void __iomem *mbase)
{
- /* This register is invisible on Blackfin, actually the MUSB
- * RTL version of Blackfin is 1.9, So just set it's value to 1.9.
+ /*
+ * This register is invisible on Blackfin, actually the MUSB
+ * RTL version of Blackfin is 1.9, so just harcode its value.
*/
- return 1 << 10 | 9;
+ return MUSB_HWVERS_1900;
}
static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
