diff options
author | Tony Lindgren <tony@atomide.com> | 2008-07-03 11:24:43 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-07-03 11:24:43 +0200 |
commit | f35ae6346850f6c192269b09088b20261760f0e0 (patch) | |
tree | 3ec954ee3aa2d37a34f00a88d25260685d1f2db6 /drivers/usb/host/ohci-omap.c | |
parent | ARM: OMAP: Change omap_cf.c and omap_nor.c to use omap_readw/writew instead o... (diff) | |
download | linux-f35ae6346850f6c192269b09088b20261760f0e0.tar.xz linux-f35ae6346850f6c192269b09088b20261760f0e0.zip |
ARM: OMAP: USB: Change omap USB code to use omap_read/write instead of __REG
Change omap USB code to use omap_read/write instead of __REG for multi-omap
Cc: David Brownell <david-b@pacbell.net>
Cc: linux-usb@vger.kernel.org
Cc: i2c@lm-sensors.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 6859fb5f1d6f..2b7c04079d56 100644 --- a/drivers/usb/host/ohci-omap.c +++ b/drivers/usb/host/ohci-omap.c @@ -169,13 +169,16 @@ static void start_hnp(struct ohci_hcd *ohci) { const unsigned port = ohci_to_hcd(ohci)->self.otg_port - 1; unsigned long flags; + u32 l; otg_start_hnp(ohci->transceiver); local_irq_save(flags); ohci->transceiver->state = OTG_STATE_A_SUSPEND; writel (RH_PS_PSS, &ohci->regs->roothub.portstatus [port]); - OTG_CTRL_REG &= ~OTG_A_BUSREQ; + l = omap_readl(OTG_CTRL); + l &= ~OTG_A_BUSREQ; + omap_writel(l, OTG_CTRL); local_irq_restore(flags); } |