summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-01-24 16:04:00 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2012-01-24 16:04:00 +0100
commitfebfb01c9db1c0dfd0c830e6d152586c3b7f55ae (patch)
tree1724c14b96a1ffdc90871d7ca3210788a135ce19
parent294c589cd748ef627a39840bc216bfe7f11e32c7 (diff)
downloadmeta-ti-febfb01c9db1c0dfd0c830e6d152586c3b7f55ae.tar.gz
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 <koen@dominion.thruhere.net>
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/beaglebone/defconfig7
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp_3.1.bb2
2 files changed, 6 insertions, 3 deletions
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
2507CONFIG_USB_MUSB_TI81XX=y 2507CONFIG_USB_MUSB_TI81XX=y
2508# CONFIG_USB_MUSB_BLACKFIN is not set 2508# CONFIG_USB_MUSB_BLACKFIN is not set
2509# CONFIG_USB_MUSB_UX500 is not set 2509# CONFIG_USB_MUSB_UX500 is not set
2510CONFIG_MUSB_PIO_ONLY=y 2510# CONFIG_MUSB_PIO_ONLY is not set
2511# CONFIG_USB_INVENTRA_DMA_HW is not set
2512# CONFIG_USB_TI_CPPI_DMA_HW is not set
2513CONFIG_USB_TI_CPPI41_DMA_HW=y
2511# CONFIG_USB_INVENTRA_DMA is not set 2514# CONFIG_USB_INVENTRA_DMA is not set
2512# CONFIG_USB_TI_CPPI_DMA is not set 2515# CONFIG_USB_TI_CPPI_DMA is not set
2513# CONFIG_USB_TI_CPPI41_DMA is not set 2516CONFIG_USB_TI_CPPI41_DMA=y
2514# CONFIG_USB_TUSB_OMAP_DMA is not set 2517# CONFIG_USB_TUSB_OMAP_DMA is not set
2515# CONFIG_USB_UX500_DMA is not set 2518# CONFIG_USB_UX500_DMA is not set
2516 2519
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 = ""
11 11
12BRANCH = "v3.1-meta-ti-r1r+gitr1d84d8853fa30cf3db2571a5aec572accca4e29d" 12BRANCH = "v3.1-meta-ti-r1r+gitr1d84d8853fa30cf3db2571a5aec572accca4e29d"
13SRCREV = "1d84d8853fa30cf3db2571a5aec572accca4e29d" 13SRCREV = "1d84d8853fa30cf3db2571a5aec572accca4e29d"
14MACHINE_KERNEL_PR_append = "h+gitr${SRCREV}" 14MACHINE_KERNEL_PR_append = "i+gitr${SRCREV}"
15 15
16COMPATIBLE_MACHINE = "(ti33x)" 16COMPATIBLE_MACHINE = "(ti33x)"
17 17