diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0072-beaglebone-fix-audio-spi-clash.patch b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0072-beaglebone-fix-audio-spi-clash.patch new file mode 100644 index 00000000..a916ad5a --- /dev/null +++ b/recipes-kernel/linux/linux-ti33x-psp-3.2/beaglebone/0072-beaglebone-fix-audio-spi-clash.patch @@ -0,0 +1,25 @@ +From 45ddec832968e3c1e31cf38a891372ba80027e2d Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 26 Jun 2012 08:39:04 +0200 +Subject: [PATCH] beaglebone: fix audio/spi clash + +Signed-off-by: Koen Kooi +--- + arch/arm/mach-omap2/board-am335xevm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c +index f6559b6..d0681a2 100644 +--- a/arch/arm/mach-omap2/board-am335xevm.c ++++ b/arch/arm/mach-omap2/board-am335xevm.c +@@ -2910,6 +2910,7 @@ static void beaglebone_cape_setup(struct memory_accessor *mem_acc, void *context + + beaglebone_leds_free = 0; + dvileds_init(0,0); ++ beaglebone_spi1_free = 0; + mcasp0_init(0,0); + + if (!strncmp("00A1", cape_config.version, 4) || !strncmp("000A", cape_config.version, 4)) { +-- +1.7.10 + diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb index 645d4dc6..ab42c442 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.2.bb @@ -15,7 +15,7 @@ PV = "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "3.2", "3.2.21", d)}" BRANCH = "v3.2-staging" SRCREV = "720e07b4c1f687b61b147b31c698cb6816d72f01" -MACHINE_KERNEL_PR_append = "a+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}" COMPATIBLE_MACHINE = "(ti33x)" @@ -1536,4 +1536,5 @@ PATCHES_OVER_PSP = " \ file://beaglebone/0069-beaglebone-add-support-for-LCD3-rev-A1.patch \ file://beaglebone/0070-beaglebone-fix-buttons-spidev-clash-when-using-mcasp.patch \ file://beaglebone/0071-beaglebone-fix-LCD3-led-key-overlap.patch \ + file://beaglebone/0072-beaglebone-fix-audio-spi-clash.patch \ "