diff options
author | Felipe Balbi <felipe.balbi@nokia.com> | 2009-03-23 21:07:49 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-03-23 21:51:20 -0400 |
commit | b0b5aa3f4c17c6a21423b9728d701216ab2e1ff1 (patch) | |
tree | 7af51785fa8be881c8b3f00071a1ae2c8d46c741 /arch/arm/mach-omap1/board-h2.c | |
parent | 52176e70837d56cd238d6edc04cc403f1ffa86c6 (diff) |
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: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
-rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index b31b6d9b2e3f..f695aa053ac8 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
@@ -369,7 +369,6 @@ static struct omap_lcd_config h2_lcd_config __initdata = { | |||
369 | }; | 369 | }; |
370 | 370 | ||
371 | static struct omap_board_config_kernel h2_config[] __initdata = { | 371 | static struct omap_board_config_kernel h2_config[] __initdata = { |
372 | { OMAP_TAG_USB, &h2_usb_config }, | ||
373 | { OMAP_TAG_UART, &h2_uart_config }, | 372 | { OMAP_TAG_UART, &h2_uart_config }, |
374 | { OMAP_TAG_LCD, &h2_lcd_config }, | 373 | { OMAP_TAG_LCD, &h2_lcd_config }, |
375 | }; | 374 | }; |
@@ -418,6 +417,7 @@ static void __init h2_init(void) | |||
418 | omap_serial_init(); | 417 | omap_serial_init(); |
419 | omap_register_i2c_bus(1, 100, h2_i2c_board_info, | 418 | omap_register_i2c_bus(1, 100, h2_i2c_board_info, |
420 | ARRAY_SIZE(h2_i2c_board_info)); | 419 | ARRAY_SIZE(h2_i2c_board_info)); |
420 | omap_usb_init(&h2_usb_config); | ||
421 | h2_mmc_init(); | 421 | h2_mmc_init(); |
422 | } | 422 | } |
423 | 423 | ||