linux-omap2 git: add mux patch for beagleboard and switch to OTG mode for MUSB

3 files changed, 28 insertions, 11 deletions

diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig
index 3d3562d9f5..3cd8286d72 100644
--- a/packages/linux/linux-omap2-git/beagleboard/defconfig
+++ b/packages/linux/linux-omap2-git/beagleboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.26-rc3-omap1
-# Tue May 20 19:38:20 2008
+# Tue May 27 19:21:03 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -179,9 +179,9 @@ CONFIG_OMAP_BOOT_TAG=y
 CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_COMPONENT_VERSION is not set
 # CONFIG_OMAP_GPIO_SWITCH is not set
-CONFIG_OMAP_MUX=n
-# CONFIG_OMAP_MUX_DEBUG is not set
-CONFIG_OMAP_MUX_WARNINGS=n
+CONFIG_OMAP_MUX=y
+CONFIG_OMAP_MUX_DEBUG=y
+CONFIG_OMAP_MUX_WARNINGS=y
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MMU_FWK is not set
 # CONFIG_OMAP_MBOX_FWK is not set
@@ -1203,7 +1203,7 @@ CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
+CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 
@@ -1228,9 +1228,10 @@ CONFIG_USB_MUSB_SOC=y
 # OMAP 343x high speed USB support
 #
 # CONFIG_USB_MUSB_HOST is not set
-CONFIG_USB_MUSB_PERIPHERAL=y
-# CONFIG_USB_MUSB_OTG is not set
+# CONFIG_USB_MUSB_PERIPHERAL is not set
+CONFIG_USB_MUSB_OTG=y
 CONFIG_USB_GADGET_MUSB_HDRC=y
+CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_INVENTRA_DMA=y
 # CONFIG_USB_TI_CPPI_DMA is not set
diff --git a/packages/linux/linux-omap2-git/beagleboard/mux.patch b/packages/linux/linux-omap2-git/beagleboard/mux.patch
new file mode 100644
index 0000000000..836b52954d
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/mux.patch
@@ -0,0 +1,15 @@
+diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
+index 7d56516..be6eb3e 100644
+--- a/arch/arm/mach-omap2/mux.c
++++ b/arch/arm/mach-omap2/mux.c
+@@ -253,8 +253,8 @@ MUX_CFG_34XX("Y13_3430_USB1HS_PHY_D7", 0x5e2,
+ 		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN)
+ 
+ /* PHY - HSUSB: 12-pin ULPI PHY: Port 2*/
+-MUX_CFG_34XX("AA8_3430_USB2HS_PHY_CLK", 0x5f0,
+-		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)
++/*KK MUX_CFG_34XX("AA8_3430_USB2HS_PHY_CLK", 0x5f0,
++		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)*/
+ MUX_CFG_34XX("AA10_3430_USB2HS_PHY_STP", 0x5f2,
+ 		OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_OUTPUT)
+ MUX_CFG_34XX("AA9_3430_USB2HS_PHY_DIR", 0x5f4,
diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb
index f128d9cc8f..3a80ae3319 100644
--- a/packages/linux/linux-omap2_git.bb
+++ b/packages/linux/linux-omap2_git.bb
@@ -5,18 +5,19 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA
 SRCREV = "41c13615e46ed02a1aaafcc267603be8ea5244e9"
 
 PV = "2.6.25+2.6.26-rc3+git${SRCREV}"
-PR = "r16"
+PR = "r18"
 
 
 SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
+	   file://defconfig"
+
+SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
            file://00001-mcbsp-transform.patch;patch=1 \
            file://00002-mcbsp-omap1.patch;patch=1 \
            file://00003-mcbsp-omap3-clock.patch;patch=1 \
            file://00004-omap2-mcbsp.patch;patch=1 \
            file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
-	   file://defconfig"
-
-SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \
+           file://mux.patch;patch=1 \
 "
 
 COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"