From febfb01c9db1c0dfd0c830e6d152586c3b7f55ae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 24 Jan 2012 16:04:00 +0100 Subject: linux-ti33x-psp 3.1: re-enable MUSB DMA for beaglebone The production tester breaks with DMA disabled, so enable it again. Any breakage due to this should get reported to TI PSP so they can fix it. This effectively reverts aa209df889e2fce6f231e10552b5e7de4605889a Signed-off-by: Koen Kooi --- recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig | 7 +++++-- recipes-kernel/linux/linux-ti33x-psp_3.1.bb | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig b/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig index 628f149b..4e8644ca 100644 --- a/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig +++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig @@ -2507,10 +2507,13 @@ CONFIG_USB_MUSB_TI81XX_GLUE=y CONFIG_USB_MUSB_TI81XX=y # CONFIG_USB_MUSB_BLACKFIN is not set # CONFIG_USB_MUSB_UX500 is not set -CONFIG_MUSB_PIO_ONLY=y +# CONFIG_MUSB_PIO_ONLY is not set +# CONFIG_USB_INVENTRA_DMA_HW is not set +# CONFIG_USB_TI_CPPI_DMA_HW is not set +CONFIG_USB_TI_CPPI41_DMA_HW=y # CONFIG_USB_INVENTRA_DMA is not set # CONFIG_USB_TI_CPPI_DMA is not set -# CONFIG_USB_TI_CPPI41_DMA is not set +CONFIG_USB_TI_CPPI41_DMA=y # CONFIG_USB_TUSB_OMAP_DMA is not set # CONFIG_USB_UX500_DMA is not set diff --git a/recipes-kernel/linux/linux-ti33x-psp_3.1.bb b/recipes-kernel/linux/linux-ti33x-psp_3.1.bb index c48435bf..ef706cb9 100644 --- a/recipes-kernel/linux/linux-ti33x-psp_3.1.bb +++ b/recipes-kernel/linux/linux-ti33x-psp_3.1.bb @@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = "" BRANCH = "v3.1-meta-ti-r1r+gitr1d84d8853fa30cf3db2571a5aec572accca4e29d" SRCREV = "1d84d8853fa30cf3db2571a5aec572accca4e29d" -MACHINE_KERNEL_PR_append = "h+gitr${SRCREV}" +MACHINE_KERNEL_PR_append = "i+gitr${SRCREV}" COMPATIBLE_MACHINE = "(ti33x)" -- cgit v1.2.3-54-g00ecf