Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 207b0e9c authored by Alistair Buxton's avatar Alistair Buxton
Browse files

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: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent 190215f9

arch/arm/plat-omap/usb.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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);