hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alistair Buxton 2009-09-22 06:01:08 +01:00
parent 190215f963
commit 207b0e9cfe
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/plat-omap/usb.c
View File

@ -614,7 +614,7 @@ omap_otg_init(struct omap_usb_config *config)
if (config->otg || config->register_host) { if (config->otg || config->register_host) {
syscon &= ~HST_IDLE_EN; syscon &= ~HST_IDLE_EN;
ohci_device.dev.platform_data = config; ohci_device.dev.platform_data = config;
if (cpu_is_omap730()) if (cpu_is_omap7xx())
ohci_resources[1].start = INT_730_USB_HHC_1; ohci_resources[1].start = INT_730_USB_HHC_1;
status = platform_device_register(&ohci_device); status = platform_device_register(&ohci_device);
if (status) if (status)
@ -626,7 +626,7 @@ omap_otg_init(struct omap_usb_config *config)
if (config->otg) { if (config->otg) {
syscon &= ~OTG_IDLE_EN; syscon &= ~OTG_IDLE_EN;
otg_device.dev.platform_data = config; otg_device.dev.platform_data = config;
if (cpu_is_omap730()) if (cpu_is_omap7xx())
otg_resources[1].start = INT_730_USB_OTG; otg_resources[1].start = INT_730_USB_OTG;
status = platform_device_register(&otg_device); status = platform_device_register(&otg_device);
if (status) if (status)
@ -731,7 +731,7 @@ static inline void omap_1510_usb_init(struct omap_usb_config *config) {}
void __init omap_usb_init(struct omap_usb_config *pdata) void __init omap_usb_init(struct omap_usb_config *pdata)
{ {
if (cpu_is_omap730() || cpu_is_omap16xx() || cpu_is_omap24xx()) if (cpu_is_omap7xx() || cpu_is_omap16xx() || cpu_is_omap24xx())
omap_otg_init(pdata); omap_otg_init(pdata);
else if (cpu_is_omap15xx()) else if (cpu_is_omap15xx())
omap_1510_usb_init(pdata); omap_1510_usb_init(pdata);