Title: [6521] trunk/drivers/usb/musb: revert musb changes that upstream didnt take
- Revision
- 6521
- Author
- vapier
- Date
- 2009-06-01 02:58:36 -0500 (Mon, 01 Jun 2009)
Log Message
revert musb changes that upstream didnt take
Modified Paths
Diff
Modified: trunk/drivers/usb/musb/musb_host.c (6520 => 6521)
--- trunk/drivers/usb/musb/musb_host.c 2009-06-01 07:15:20 UTC (rev 6520)
+++ trunk/drivers/usb/musb/musb_host.c 2009-06-01 07:58:36 UTC (rev 6521)
@@ -684,7 +684,6 @@
/* flush all old state, set default */
if (csr & MUSB_TXCSR_MODE)
musb_h_tx_flush_fifo(hw_ep);
-
csr &= ~(MUSB_TXCSR_H_NAKTIMEOUT
| MUSB_TXCSR_DMAMODE
| MUSB_TXCSR_FRCDATATOG
Modified: trunk/drivers/usb/musb/musb_regs.h (6520 => 6521)
--- trunk/drivers/usb/musb/musb_regs.h 2009-06-01 07:15:20 UTC (rev 6520)
+++ trunk/drivers/usb/musb/musb_regs.h 2009-06-01 07:58:36 UTC (rev 6521)
@@ -333,11 +333,11 @@
static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
{
- return (void __iomem *)(MUSB_BUSCTL_OFFSET(i, 0) + mbase);
+ return (MUSB_BUSCTL_OFFSET(i, 0) + mbase);
}
static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
- u8 qh_addr_req)
+ u8 qh_addr_reg)
{
musb_writeb(ep_target_regs, MUSB_RXFUNCADDR, qh_addr_reg);
}
@@ -365,7 +365,7 @@
u8 qh_addr_reg)
{
musb_writeb(mbase, MUSB_BUSCTL_OFFSET(epnum, MUSB_TXHUBADDR),
- qh_h_addr_reg);
+ qh_addr_reg);
}
static inline void musb_write_txhubport(void __iomem *mbase, u8 epnum,
@@ -473,9 +473,9 @@
return 0;
}
-static inline void __iomem *musb_read_target_reg_base(u8 i, void __iomem *mbase)
+static inline u16 musb_read_target_reg_base(u8 i, void __iomem *mbase)
{
- return NULL;
+ return 0;
}
static inline void musb_write_rxfunaddr(void __iomem *ep_target_regs,
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
