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

Commit b0b5aa3f authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren
Browse files

ARM: OMAP: get rid of OMAP_TAG_USB, v2 



OMAP_TAGS should vanish soon since they're not generic arm tags.
Most of them can be converted to a platform_data or parsed
from a command line like e.g. serial tag.

For OMAP_TAG_USB we just let boards call omap_usb_init()
passing a pointer to omap_usb_config.

Patch updated by Tony for mainline, basically make
n770 and h4 compile. Also folded in a fix for OSK
by David Brownell <dbrownell@users.sourceforge.net>.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 52176e70

arch/arm/mach-omap1/board-ams-delta.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,6 @@ static struct omap_usb_config ams_delta_usb_config __initdata = { 
static struct omap_board_config_kernel ams_delta_config[] = {

	{ OMAP_TAG_LCD,		&ams_delta_lcd_config },

	{ OMAP_TAG_UART,	&ams_delta_uart_config },

	{ OMAP_TAG_USB,		&ams_delta_usb_config },

};



static struct resource ams_delta_kp_resources[] = {
@@ -232,6 +231,7 @@ static void __init ams_delta_init(void) 
	/* Clear latch2 (NAND, LCD, modem enable) */

	ams_delta_latch2_write(~0, 0);



	omap_usb_init(&ams_delta_usb_config);

	platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));

}

arch/arm/mach-omap1/board-generic.c

+2 −3
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ static struct omap_uart_config generic_uart_config __initdata = { 
};



static struct omap_board_config_kernel generic_config[] __initdata = {

	{ OMAP_TAG_USB,		NULL },

	{ OMAP_TAG_UART,	&generic_uart_config },

};
@@ -70,12 +69,12 @@ static void __init omap_generic_init(void) 
{

#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap15xx()) {

		generic_config[0].data = &generic1510_usb_config;

		omap_usb_init(&generic1510_usb_config);

	}

#endif

#if defined(CONFIG_ARCH_OMAP16XX)

	if (!cpu_is_omap1510()) {

		generic_config[0].data = &generic1610_usb_config;

		omap_usb_init(&generic1610_usb_config);

	}

#endif

arch/arm/mach-omap1/board-h2.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ static struct omap_lcd_config h2_lcd_config __initdata = { 
};



static struct omap_board_config_kernel h2_config[] __initdata = {

	{ OMAP_TAG_USB,		&h2_usb_config },

	{ OMAP_TAG_UART,	&h2_uart_config },

	{ OMAP_TAG_LCD,		&h2_lcd_config },

};
@@ -418,6 +417,7 @@ static void __init h2_init(void) 
	omap_serial_init();

	omap_register_i2c_bus(1, 100, h2_i2c_board_info,

			      ARRAY_SIZE(h2_i2c_board_info));

	omap_usb_init(&h2_usb_config);

	h2_mmc_init();

}

arch/arm/mach-omap1/board-h3.c

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,6 @@ static struct omap_lcd_config h3_lcd_config __initdata = { 
};



static struct omap_board_config_kernel h3_config[] __initdata = {

	{ OMAP_TAG_USB,		&h3_usb_config },

	{ OMAP_TAG_UART,	&h3_uart_config },

	{ OMAP_TAG_LCD,		&h3_lcd_config },

};
@@ -477,6 +476,7 @@ static void __init h3_init(void) 
	omap_serial_init();

	omap_register_i2c_bus(1, 100, h3_i2c_board_info,

			      ARRAY_SIZE(h3_i2c_board_info));

	omap_usb_init(&h3_usb_config);

	h3_mmc_init();

}

arch/arm/mach-omap1/board-innovator.c

+2 −3
Original line number Diff line number Diff line
@@ -373,7 +373,6 @@ static struct omap_uart_config innovator_uart_config __initdata = { 
};



static struct omap_board_config_kernel innovator_config[] = {

	{ OMAP_TAG_USB,         NULL },

	{ OMAP_TAG_LCD,		NULL },

	{ OMAP_TAG_UART,	&innovator_uart_config },

};
@@ -395,13 +394,13 @@ static void __init innovator_init(void) 


#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap1510()) {

		innovator_config[0].data = &innovator1510_usb_config;

		omap_usb_init(&innovator1510_usb_config);

		innovator_config[1].data = &innovator1510_lcd_config;

	}

#endif

#ifdef CONFIG_ARCH_OMAP16XX

	if (cpu_is_omap1610()) {

		innovator_config[0].data = &h2_usb_config;

		omap_usb_init(&h2_usb_config);

		innovator_config[1].data = &innovator1610_lcd_config;

	}

#endif