From: Felipe Balbi <[EMAIL PROTECTED]>
Signed-off-by: Felipe Balbi <[EMAIL PROTECTED]>
---
drivers/usb/host/ohci-omap.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 91697bd..fe5a351 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -115,10 +115,10 @@ static int omap_ohci_transceiver_power(int on)
static int omap_1510_local_bus_power(int on)
{
if (on) {
- omap_writel((1 << 1) | (1 << 0), OMAP1510_LB_MMU_CTL);
+ __raw_writel((1 << 1) | (1 << 0), OMAP1510_LB_MMU_CTL);
udelay(200);
} else {
- omap_writel(0, OMAP1510_LB_MMU_CTL);
+ __raw_writel(0, OMAP1510_LB_MMU_CTL);
}
return 0;
@@ -136,24 +136,24 @@ static int omap_1510_local_bus_init(void)
unsigned int tlb;
unsigned long lbaddr, physaddr;
- omap_writel((omap_readl(OMAP1510_LB_CLOCK_DIV) & 0xfffffff8) | 0x4,
+ __raw_writel((__raw_readl(OMAP1510_LB_CLOCK_DIV) & 0xfffffff8) | 0x4,
OMAP1510_LB_CLOCK_DIV);
/* Configure the Local Bus MMU table */
for (tlb = 0; tlb < OMAP1510_LB_MEMSIZE; tlb++) {
lbaddr = tlb * 0x00100000 + OMAP1510_LB_OFFSET;
physaddr = tlb * 0x00100000 + PHYS_OFFSET;
- omap_writel((lbaddr & 0x0fffffff) >> 22, OMAP1510_LB_MMU_CAM_H);
- omap_writel(((lbaddr & 0x003ffc00) >> 6) | 0xc,
+ __raw_writel((lbaddr & 0x0fffffff) >> 22,
OMAP1510_LB_MMU_CAM_H);
+ __raw_writel(((lbaddr & 0x003ffc00) >> 6) | 0xc,
OMAP1510_LB_MMU_CAM_L);
- omap_writel(physaddr >> 16, OMAP1510_LB_MMU_RAM_H);
- omap_writel((physaddr & 0x0000fc00) | 0x300,
OMAP1510_LB_MMU_RAM_L);
- omap_writel(tlb << 4, OMAP1510_LB_MMU_LCK);
- omap_writel(0x1, OMAP1510_LB_MMU_LD_TLB);
+ __raw_writel(physaddr >> 16, OMAP1510_LB_MMU_RAM_H);
+ __raw_writel((physaddr & 0x0000fc00) | 0x300,
OMAP1510_LB_MMU_RAM_L);
+ __raw_writel(tlb << 4, OMAP1510_LB_MMU_LCK);
+ __raw_writel(0x1, OMAP1510_LB_MMU_LD_TLB);
}
/* Enable the walking table */
- omap_writel(omap_readl(OMAP1510_LB_MMU_CTL) | (1 << 3),
OMAP1510_LB_MMU_CTL);
+ __raw_writel(__raw_readl(OMAP1510_LB_MMU_CTL) | (1 << 3),
OMAP1510_LB_MMU_CTL);
udelay(200);
return 0;
@@ -176,9 +176,9 @@ static void start_hnp(struct ohci_hcd *ohci)
local_irq_save(flags);
ohci->transceiver->state = OTG_STATE_A_SUSPEND;
writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]);
- l = omap_readl(OTG_CTRL);
+ l = __raw_readl(OTG_CTRL);
l &= ~OTG_A_BUSREQ;
- omap_writel(l, OTG_CTRL);
+ __raw_writel(l, OTG_CTRL);
local_irq_restore(flags);
}
--
1.6.0.2.307.gc427
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
