diff options
author | Tony Lindgren <tony@atomide.com> | 2008-09-04 19:29:55 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 17:40:59 -0400 |
commit | 9b466c3b8208f395cb3492e32b254a81c5b31780 (patch) | |
tree | 76a52d7b47ae5c4197223c9e49439e9430da22e1 /drivers/usb | |
parent | 28c2c51c078296151549f4f0e823e804f773861b (diff) |
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/ohci-omap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c index 522185629624..91697bdb399f 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) | |||
231 | 231 | ||
232 | omap_ohci_clock_power(1); | 232 | omap_ohci_clock_power(1); |
233 | 233 | ||
234 | if (cpu_is_omap1510()) { | 234 | if (cpu_is_omap15xx()) { |
235 | omap_1510_local_bus_power(1); | 235 | omap_1510_local_bus_power(1); |
236 | omap_1510_local_bus_init(); | 236 | omap_1510_local_bus_init(); |
237 | } | 237 | } |
@@ -319,7 +319,7 @@ static int usb_hcd_omap_probe (const struct hc_driver *driver, | |||
319 | if (IS_ERR(usb_host_ck)) | 319 | if (IS_ERR(usb_host_ck)) |
320 | return PTR_ERR(usb_host_ck); | 320 | return PTR_ERR(usb_host_ck); |
321 | 321 | ||
322 | if (!cpu_is_omap1510()) | 322 | if (!cpu_is_omap15xx()) |
323 | usb_dc_ck = clk_get(0, "usb_dc_ck"); | 323 | usb_dc_ck = clk_get(0, "usb_dc_ck"); |
324 | else | 324 | else |
325 | usb_dc_ck = clk_get(0, "lb_ck"); | 325 | usb_dc_ck = clk_get(0, "lb_ck"); |