summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-generic.c
diff options
context:
space:
mode:
authorFelipe Balbi <felipe.balbi@nokia.com>2009-03-23 18:07:49 -0700
committerTony Lindgren <tony@atomide.com>2009-03-23 18:51:20 -0700
commitb0b5aa3f4c17c6a21423b9728d701216ab2e1ff1 (patch)
tree7af51785fa8be881c8b3f00071a1ae2c8d46c741 /arch/arm/mach-omap1/board-generic.c
parent52176e70837d56cd238d6edc04cc403f1ffa86c6 (diff)
downloadop-kernel-dev-b0b5aa3f4c17c6a21423b9728d701216ab2e1ff1.zip
op-kernel-dev-b0b5aa3f4c17c6a21423b9728d701216ab2e1ff1.tar.gz
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-generic.c')
-rw-r--r--arch/arm/mach-omap1/board-generic.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 7d26702..e724940 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -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
OpenPOWER on IntegriCloud