Skip to contentSkip to conversation

omap: zoom3: enable ehci support

PATCH New Vikram Pandita 2 participants 3 messages Jan 7, 2010 – Jan 11, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 omap: zoom3: enable ehci support

Zoom3 board has omap3630 EHCI port2 connected to a ULPI phy. GPIO_64 is connected to the PHY reset pin.

---
History:
v1: initial draft
v2: fix minor header file include comment by Anand Gadiyar

 arch/arm/mach-omap2/board-zoom3.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-zoom3.c +15 -0
index a9fe918..b691340 100644
@@ -20,6 +20,7 @@
 
 #include <plat/common.h>
 #include <plat/board.h>
+#include <plat/usb.h>
 
 #include "mux.h"
 #include "sdram-hynix-h8mbx00u0mer-0em.h"
@@ -51,11 +52,25 @@ static struct omap_board_mux board_mux[] __initdata = {
 #define board_mux	NULL
 #endif
 
+static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
+	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
+	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
+
+	.phy_reset  = true,
+	.reset_gpio_port[0]  = -EINVAL,
+	.reset_gpio_port[1]  = 64,
+	.reset_gpio_port[2]  = -EINVAL
+};
+
 static void __init omap_zoom_init(void)
 {
 	omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
 	zoom_peripherals_init();
 	zoom_debugboard_init();
+
+	omap_mux_init_gpio(64, OMAP_PIN_OUTPUT);
+	usb_ehci_init(&ehci_pdata);
 }
 
 MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
Signature · 1 line
1.6.6.rc0.66.ge160d
maintainer
#1 lore raw

PATCH v2 1/1 omap: zoom3: enable ehci support

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Initial commit ID (Likely to change): 426d2accc2b9c0392b2be9b8daed5699a08d8822

PatchWorks
http://patchwork.kernel.org/patch/71641/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=426d2accc2b9c0392b2be9b8daed5699a08d8822

maintainer
#2 lore raw
Quoted 5 lines · Tony Lindgren

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: for-next

Quoted 7 lines

Initial commit ID (Likely to change): 426d2accc2b9c0392b2be9b8daed5699a08d8822

PatchWorks
http://patchwork.kernel.org/patch/71641/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=426d2accc2b9c0392b2be9b8daed5699a08d8822

I've updated the patch with following cosmetic clean-up:

arch/arm/mach-omap2/board-zoom3.c +7 -8
index b691340..6512b21 100644
@@ -53,14 +53,13 @@ static struct omap_board_mux board_mux[] __initdata = {
 #endif
 
 static struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
-	.port_mode[0] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
-	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
-
-	.phy_reset  = true,
-	.reset_gpio_port[0]  = -EINVAL,
-	.reset_gpio_port[1]  = 64,
-	.reset_gpio_port[2]  = -EINVAL
+	.port_mode[0]		= EHCI_HCD_OMAP_MODE_UNKNOWN,
+	.port_mode[1]		= EHCI_HCD_OMAP_MODE_PHY,
+	.port_mode[2]		= EHCI_HCD_OMAP_MODE_UNKNOWN,
+	.phy_reset		= true,
+	.reset_gpio_port[0]	= -EINVAL,
+	.reset_gpio_port[1]	= 64,
+	.reset_gpio_port[2]	= -EINVAL,
 };
 
 static void __init omap_zoom_init(void)

Regards,

Tony