diff options
author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-22 01:01:08 -0400 |
---|---|---|
committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-07 18:14:01 -0400 |
commit | 207b0e9cfef296c469cce84f74455f97f8ab2227 (patch) | |
tree | 7bb95bd47b6e3043c1a484abe55fad0915762ef1 /arch/arm/plat-omap/usb.c | |
parent | 190215f963551405cc97ed220003bb7524219131 (diff) |
OMAP7XX: USB: Remove duplicate omap850 code
This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>
Diffstat (limited to 'arch/arm/plat-omap/usb.c')
-rw-r--r-- | arch/arm/plat-omap/usb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c index 509f2ed99e21..980d2eb68a24 100644 --- a/arch/arm/plat-omap/usb.c +++ b/arch/arm/plat-omap/usb.c | |||
@@ -614,7 +614,7 @@ omap_otg_init(struct omap_usb_config *config) | |||
614 | if (config->otg || config->register_host) { | 614 | if (config->otg || config->register_host) { |
615 | syscon &= ~HST_IDLE_EN; | 615 | syscon &= ~HST_IDLE_EN; |
616 | ohci_device.dev.platform_data = config; | 616 | ohci_device.dev.platform_data = config; |
617 | if (cpu_is_omap730()) | 617 | if (cpu_is_omap7xx()) |
618 | ohci_resources[1].start = INT_730_USB_HHC_1; | 618 | ohci_resources[1].start = INT_730_USB_HHC_1; |
619 | status = platform_device_register(&ohci_device); | 619 | status = platform_device_register(&ohci_device); |
620 | if (status) | 620 | if (status) |
@@ -626,7 +626,7 @@ omap_otg_init(struct omap_usb_config *config) | |||
626 | if (config->otg) { | 626 | if (config->otg) { |
627 | syscon &= ~OTG_IDLE_EN; | 627 | syscon &= ~OTG_IDLE_EN; |
628 | otg_device.dev.platform_data = config; | 628 | otg_device.dev.platform_data = config; |
629 | if (cpu_is_omap730()) | 629 | if (cpu_is_omap7xx()) |
630 | otg_resources[1].start = INT_730_USB_OTG; | 630 | otg_resources[1].start = INT_730_USB_OTG; |
631 | status = platform_device_register(&otg_device); | 631 | status = platform_device_register(&otg_device); |
632 | if (status) | 632 | if (status) |
@@ -731,7 +731,7 @@ static inline void omap_1510_usb_init(struct omap_usb_config *config) {} | |||
731 | 731 | ||
732 | void __init omap_usb_init(struct omap_usb_config *pdata) | 732 | void __init omap_usb_init(struct omap_usb_config *pdata) |
733 | { | 733 | { |
734 | if (cpu_is_omap730() || cpu_is_omap16xx() || cpu_is_omap24xx()) | 734 | if (cpu_is_omap7xx() || cpu_is_omap16xx() || cpu_is_omap24xx()) |
735 | omap_otg_init(pdata); | 735 | omap_otg_init(pdata); |
736 | else if (cpu_is_omap15xx()) | 736 | else if (cpu_is_omap15xx()) |
737 | omap_1510_usb_init(pdata); | 737 | omap_1510_usb_init(pdata); |