From: Felipe Balbi <felipe.balbi@nokia.com>
Date: Thu, 24 Apr 2008 21:46:00 +0000 (+0300)
Subject: USB: BEAGLE: Add usb support for omap3beagle
X-Git-Tag: v2.6.26-omap1~123^2~171
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bf37ec8435ed911d22c6cd7666d005d14669d781;p=linux-2.6-omap-h63xx.git

USB: BEAGLE: Add usb support for omap3beagle

This patch is based on previous patch by
Koen Kooi <koen@openembedded.org>. It uses
the new generic usb init calls for omap3-
and omap2430-based boards.

Signed-off-by: Felipe Balbi <me@felipebalbi.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 9b6f60e5ed1..725dae518f9 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP)		+= board-3430sdp.o \
 					   board-3430sdp-flash.o
 obj-$(CONFIG_MACH_OMAP3EVM)		+= board-omap3evm.o
 obj-$(CONFIG_MACH_OMAP3_BEAGLE)		+= board-omap3beagle.o \
+					   usb-musb.o usb-ehci.o \
 					   board-sdp-hsmmc.o
 obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o \
 					   board-apollon-mmc.o	\
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index c03bb260ded..ad5ad2e6d2a 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -27,6 +27,8 @@
 
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
+#include <asm/arch/usb-musb.h>
+#include <asm/arch/usb-ehci.h>
 #include <asm/arch/common.h>
 
 static struct omap_uart_config omap3_beagle_uart_config __initdata = {
@@ -66,6 +68,8 @@ static void __init omap3_beagle_init(void)
 	omap_board_config_size = ARRAY_SIZE(omap3_beagle_config);
 	omap_serial_init();
 	sdp_mmc_init();
+	usb_musb_init();
+	usb_ehci_init();
 }
 
 arch_initcall(omap3_beagle_i2c_init);