linux-omap-psp 2.6.29: add WIP patch for EHCI support

3 files changed, 68 insertions, 2 deletions

diff --git a/recipes/linux/linux-omap-psp-2.6.29/omap3517-evm/defconfig b/recipes/linux/linux-omap-psp-2.6.29/omap3517-evm/defconfig
index 3092f7b098..4fa37bd8ef 100644
--- a/recipes/linux/linux-omap-psp-2.6.29/omap3517-evm/defconfig
+++ b/recipes/linux/linux-omap-psp-2.6.29/omap3517-evm/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-omap1
-# Mon Sep  7 19:18:57 2009
+# Tue Sep  8 15:41:48 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1003,7 +1003,11 @@ CONFIG_USB=y
 # USB Host Controller Drivers
 #
 # CONFIG_USB_C67X00_HCD is not set
-# CONFIG_USB_EHCI_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_OMAP_EHCI_PHY_MODE=y
+# CONFIG_OMAP_EHCI_TLL_MODE is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_OHCI_HCD is not set
@@ -1084,6 +1088,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_IDMOUSE is not set
 # CONFIG_USB_FTDI_ELAN is not set
 # CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
 # CONFIG_USB_LD is not set
 # CONFIG_USB_TRANCEVIBRATOR is not set
 # CONFIG_USB_IOWARRIOR is not set
diff --git a/recipes/linux/linux-omap-psp-2.6.29/shiva-ehci.diff b/recipes/linux/linux-omap-psp-2.6.29/shiva-ehci.diff
new file mode 100755
index 0000000000..418dca86b5
--- /dev/null
+++ b/recipes/linux/linux-omap-psp-2.6.29/shiva-ehci.diff
@@ -0,0 +1,60 @@
+commit b73387d2642df981a4cfacddaa36aab8b1ea604b
+Author: Ajay Kumar Gupta <ajay.gupta@ti.com>
+Date:   Fri Jul 10 18:01:29 2009 +0530
+
+    ehci: adding support for EHCI
+    
+    Port1 is used and EHCI port on OMAP3517. GPIO57 is
+    used to reset the EHCI phy.
+    
+    	- Added usb_ehci_init()
+    	- Added port1 phy reset padconfig
+
+diff --git a/arch/arm/mach-omap2/board-omap3517evm.c b/arch/arm/mach-omap2/board-omap3517evm.c
+index cb5af8f..af2d3a9 100644
+--- a/arch/arm/mach-omap2/board-omap3517evm.c
++++ b/arch/arm/mach-omap2/board-omap3517evm.c
+@@ -399,6 +399,9 @@ static void __init omap3517_evm_init(void)
+ 
+ 	omap3517evm_flash_init();
+ 	usb_musb_init();
++	/* GPIO57 as port1 phy reset */
++	omap_cfg_reg(N5_3517_GPIO57_OUT);
++	usb_ehci_init();
+ 	/*
+ 	 * MMC init function
+ 	 */
+ 
+diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h
+index aa9d5a1..4e5a247 100644
+--- a/arch/arm/plat-omap/include/mach/mux.h
++++ b/arch/arm/plat-omap/include/mach/mux.h
+@@ -805,6 +805,7 @@ enum omap34xx_index {
+ 	J25_34XX_GPIO170,
+ #ifdef CONFIG_MACH_OMAP3517EVM
+ 	E25_3517_USB0_DRVVBUS,
++	N5_3517_GPIO57_OUT,
+ #endif
+ };
+ 
+--- /tmp/mux.c	2009-09-08 15:06:05.000000000 +0200
++++ git/arch/arm/mach-omap2/mux.c	2009-09-08 15:08:28.000000000 +0200
+@@ -486,16 +486,10 @@
+ 		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
+ MUX_CFG_34XX("J25_34XX_GPIO170", 0x1c6,
+ 		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_INPUT)
+-#ifdef CONFIG_MACH_OMAP3517EVM
+ MUX_CFG_34XX("E25_3517_USB0_DRVVBUS", 0x212,
+ 		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLDOWN)
+-#if 0
+-MUX_CFG_34XX("F24_3517_USB0_DM", 0x212,
+-		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLDOWN)
+-MUX_CFG_34XX("F25_3517_USB0_DP", 0x212,
+-		OMAP34XX_MUX_MODE0 | OMAP34XX_PIN_INPUT_PULLDOWN)
+-#endif
+-#endif
++MUX_CFG_34XX("N5_3517_GPIO57_OUT", 0x0ba,
++		OMAP34XX_MUX_MODE4 | OMAP34XX_PIN_OUTPUT)
+ };
+ 
+ #define OMAP34XX_PINS_SZ	ARRAY_SIZE(omap34xx_pins)
diff --git a/recipes/linux/linux-omap-psp_2.6.29.bb b/recipes/linux/linux-omap-psp_2.6.29.bb
index a336622583..4c213b1dd1 100644
--- a/recipes/linux/linux-omap-psp_2.6.29.bb
+++ b/recipes/linux/linux-omap-psp_2.6.29.bb
@@ -18,6 +18,7 @@ S = "${WORKDIR}/git"
 
 SRC_URI_append_omap3517-evm = " \
         file://shiva-bits.diff;patch=1 \
+        file://shiva-ehci.diff;patch=1 \
 "
 
 SRC_URI_append_omap3evm = " \