From ab07a0ea4be961a7e8c7b8b64a56ce6c730cd6e0 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Fri, 21 Oct 2011 16:15:36 +0200
Subject: [PATCH] linux-ti33x-psp 3.1rc8: include latest MUSB code, remove
 machine ID patches

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig  | 8 ++++----
 recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb         | 7 ++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig
index 7adcefc1..fad92d70 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.0+3.1rc/beaglebone/defconfig
@@ -345,7 +345,6 @@ CONFIG_MACH_IGEP0020=y
 CONFIG_MACH_TI8168EVM=y
 CONFIG_MACH_AM335XEVM=y
 CONFIG_MACH_AM335XIAEVM=y
-CONFIG_MACH_BEAGLEBONE=y
 # CONFIG_OMAP3_EMU is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP3_EDMA=y
@@ -2591,8 +2590,6 @@ CONFIG_USB_GADGET=y
 # CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_USB_GADGET_VBUS_DRAW=2
 CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_GADGET_PORT_USB1=y
-# CONFIG_USB_GADGET_PORT_USB0 is not set
 # CONFIG_USB_FUSB300 is not set
 # CONFIG_USB_OMAP is not set
 # CONFIG_USB_R8A66597 is not set
@@ -2601,6 +2598,10 @@ CONFIG_USB_GADGET_MUSB_HDRC=y
 # CONFIG_USB_NET2272 is not set
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_GADGET_DUALSPEED=y
+CONFIG_USB_G_DBGP=y
+CONFIG_USB_G_DBGP_PRINTK=y
+CONFIG_USB_GADGET_PORT_USB1=y
+# CONFIG_USB_GADGET_PORT_USB0 is not set
 CONFIG_USB_ZERO=m
 CONFIG_USB_AUDIO=m
 CONFIG_USB_ETH=m
@@ -2623,7 +2624,6 @@ CONFIG_USB_G_MULTI=m
 CONFIG_USB_G_MULTI_RNDIS=y
 # CONFIG_USB_G_MULTI_CDC is not set
 CONFIG_USB_G_HID=m
-# CONFIG_USB_G_DBGP is not set
 CONFIG_USB_G_WEBCAM=m
 
 #
diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb b/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb
index d91e8e3c..9672153c 100644
--- a/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb
+++ b/recipes-kernel/linux/linux-ti33x-psp_3.0+3.1rc.bb
@@ -10,8 +10,8 @@ S = "${WORKDIR}/git"
 MULTI_CONFIG_BASE_SUFFIX = ""
 
 BRANCH = "master"
-SRCREV = "a95ceb11b5858feae89895d14d7f7bc41cca9fd6"
-MACHINE_KERNEL_PR_append = "h+gitr${SRCREV}"
+SRCREV = "c7fc664a6a36a4721b43dc287e410a2453f0b782"
+MACHINE_KERNEL_PR_append = "i+gitr${SRCREV}"
 
 COMPATIBLE_MACHINE = "(ti33x)"
 
@@ -27,9 +27,6 @@ SRC_URI += "git://arago-project.org/git/projects/linux-am33x.git;protocol=git;br
 PATCHES_OVER_PSP = " \
 	file://0001-f_rndis-HACK-around-undefined-variables.patch \
 	file://0001-am335x-Add-pin-mux-and-init-for-beaglebone-specific-.patch \
-	file://0001-mach-types-Add-new-machine-type-beaglebone-to-mach-t.patch \
-	file://0002-Kconfig-Add-support-for-beaglebone-machine-id.patch \
-	file://0003-am335xevm-Use-new-beaglebone-machine-id.patch \
 	"
 
 SRC_URI += "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "", "${PATCHES_OVER_PSP}", d)}"