summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2008-09-04 16:29:55 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-10-17 14:40:59 -0700
commit9b466c3b8208f395cb3492e32b254a81c5b31780 (patch)
tree76a52d7b47ae5c4197223c9e49439e9430da22e1
parent28c2c51c078296151549f4f0e823e804f773861b (diff)
downloadop-kernel-dev-9b466c3b8208f395cb3492e32b254a81c5b31780.zip
op-kernel-dev-9b466c3b8208f395cb3492e32b254a81c5b31780.tar.gz
USB: ohci-omap: handle other omap15xx chips
Sync up USB parts of the ohci-omap support in mainline with the OMAP tree. This patch supports another first generation OMAP1 part: not just the OMAP 1510 (and its catalog version, the OMAP 5910), but also OMAP 310. From: Tony Lindgren <tony@atomide.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/host/ohci-omap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 5221856..91697bd 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -231,7 +231,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
omap_ohci_clock_power(1);
- if (cpu_is_omap1510()) {
+ if (cpu_is_omap15xx()) {
omap_1510_local_bus_power(1);
omap_1510_local_bus_init();
}
@@ -319,7 +319,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver,
if (IS_ERR(usb_host_ck))
return PTR_ERR(usb_host_ck);
- if (!cpu_is_omap1510())
+ if (!cpu_is_omap15xx())
usb_dc_ck = clk_get(0, "usb_dc_ck");
else
usb_dc_ck = clk_get(0, "lb_ck");
OpenPOWER on IntegriCloud