From d8d56dea969292f563b2c377e885860d7775e83f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Tue, 18 Oct 2011 16:35:09 +0200
Subject: [PATCH] linux-ti33x-psp 3.1rc8: fix USB regression for beaglebone,
 don't disable DEBUGSS clocks on boot

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../beaglebone/defconfig                      | 35 ++++++++++++++++---
 .../linux/linux-ti33x-psp_3.0+3.1rc.bb        |  1 +
 2 files changed, 31 insertions(+), 5 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 f3a0a9e0..68318650 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
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.1.0-rc3 Kernel Configuration
+# Linux/arm 3.1.0-rc8 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -312,7 +312,7 @@ CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
 CONFIG_ARCH_OMAP3=y
 # CONFIG_ARCH_OMAP4 is not set
 # CONFIG_SOC_OMAP3430 is not set
-CONFIG_SOC_OMAPTI81XX=y
+CONFIG_SOC_OMAPTI816X=y
 CONFIG_SOC_OMAPAM33XX=y
 CONFIG_OMAP_PACKAGE_CBB=y
 
@@ -343,8 +343,8 @@ CONFIG_MACH_IGEP0020=y
 # CONFIG_MACH_SBC3530 is not set
 # CONFIG_MACH_OMAP_3630SDP is not set
 CONFIG_MACH_TI8168EVM=y
-CONFIG_MACH_TI8148EVM=y
 CONFIG_MACH_AM335XEVM=y
+CONFIG_MACH_AM335XIAEVM=y
 # CONFIG_OMAP3_EMU is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP3_EDMA=y
@@ -706,7 +706,29 @@ CONFIG_DNS_RESOLVER=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_TI_HECC=m
+# CONFIG_CAN_MCP251X is not set
+# CONFIG_CAN_SJA1000 is not set
+# CONFIG_CAN_C_CAN is not set
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+# CONFIG_CAN_SOFTING is not set
+# CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_IRDA=m
 
 #
@@ -979,7 +1001,6 @@ CONFIG_ATA_OVER_ETH=m
 # CONFIG_SENSORS_LIS3LV02D is not set
 CONFIG_MISC_DEVICES=y
 # CONFIG_AD525X_DPOT is not set
-# CONFIG_INTEL_MID_PTI is not set
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_APDS9802ALS is not set
@@ -2566,6 +2587,8 @@ 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 is not set
+CONFIG_USB_GADGET_PORT_USB0=y
 # CONFIG_USB_FUSB300 is not set
 # CONFIG_USB_OMAP is not set
 # CONFIG_USB_R8A66597 is not set
@@ -2739,6 +2762,7 @@ CONFIG_RTC_DRV_TWL4030=y
 #
 # on-CPU RTC drivers
 #
+# CONFIG_RTC_DRV_OMAP is not set
 # CONFIG_DMADEVICES is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
@@ -3215,6 +3239,7 @@ CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 # CONFIG_DEBUG_ICEDCC is not set
 # CONFIG_OC_ETM is not set
+CONFIG_DEBUG_JTAG_ENABLE=y
 
 #
 # Security options
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 4b2a0ff8..1526615c 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
@@ -11,6 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = ""
 
 BRANCH = "master"
 SRCREV = "10a9c95f6713ce4f7db7088443676808ca79a851"
+MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
 
 COMPATIBLE_MACHINE = "(ti33x)"