From 29719b15eededd6a3f9b985d1fa2304d3aa9de77 Mon Sep 17 00:00:00 2001 From: "Franklin S. Cooper Jr" Date: Thu, 27 Jun 2013 10:57:31 -0500 Subject: linux-am335x-psp: Enable USB with DMA by default * Patches have been added to fix some USB with DMA. * Enable support for this by default by removing the patch that disabled it. Signed-off-by: Franklin S. Cooper Jr Signed-off-by: Denys Dmytriyenko --- ...01-am335x_evm_defconfig-turn-off-MUSB-DMA.patch | 35 ---------------------- recipes-kernel/linux/linux-am335x-psp_3.2.bb | 3 +- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 recipes-kernel/linux/linux-am335x-psp-3.2/0001-am335x_evm_defconfig-turn-off-MUSB-DMA.patch diff --git a/recipes-kernel/linux/linux-am335x-psp-3.2/0001-am335x_evm_defconfig-turn-off-MUSB-DMA.patch b/recipes-kernel/linux/linux-am335x-psp-3.2/0001-am335x_evm_defconfig-turn-off-MUSB-DMA.patch deleted file mode 100644 index 6a32c2c3..00000000 --- a/recipes-kernel/linux/linux-am335x-psp-3.2/0001-am335x_evm_defconfig-turn-off-MUSB-DMA.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 95eca5a896c96d0af7188c97825a3b3ef5313ed3 Mon Sep 17 00:00:00 2001 -From: Chase Maupin -Date: Thu, 2 Feb 2012 16:38:51 -0600 -Subject: [PATCH] am335x_evm_defconfig: turn off MUSB DMA - -* Turn off the MUSB DMA in the am335x_evm_defconfig. This way - we can pull the default defconfig without enabling the - faulty USB DMA. - -Signed-off-by: Chase Maupin ---- - arch/arm/configs/am335x_evm_defconfig | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/configs/am335x_evm_defconfig b/arch/arm/configs/am335x_evm_defconfig -index d105c61..121dc7f 100644 ---- a/arch/arm/configs/am335x_evm_defconfig -+++ b/arch/arm/configs/am335x_evm_defconfig -@@ -1982,11 +1982,11 @@ 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_USB_TI_CPPI41_DMA_HW=y --# CONFIG_MUSB_PIO_ONLY is not set -+# CONFIG_USB_TI_CPPI41_DMA_HW is not set -+CONFIG_MUSB_PIO_ONLY=y - # CONFIG_USB_INVENTRA_DMA is not set - # CONFIG_USB_TI_CPPI_DMA is not set --CONFIG_USB_TI_CPPI41_DMA=y -+# CONFIG_USB_TI_CPPI41_DMA is not set - # CONFIG_USB_TUSB_OMAP_DMA is not set - # CONFIG_USB_UX500_DMA is not set - # CONFIG_USB_RENESAS_USBHS is not set --- -1.7.0.4 diff --git a/recipes-kernel/linux/linux-am335x-psp_3.2.bb b/recipes-kernel/linux/linux-am335x-psp_3.2.bb index 00c4b106..7fd69353 100644 --- a/recipes-kernel/linux/linux-am335x-psp_3.2.bb +++ b/recipes-kernel/linux/linux-am335x-psp_3.2.bb @@ -15,7 +15,7 @@ DEPENDS += "am33x-cm3" KERNEL_IMAGETYPE = "uImage" # The main PR is now using MACHINE_KERNEL_PR, for ti33x see conf/machine/include/ti33x.inc -MACHINE_KERNEL_PR_append = "d+gitr${SRCPV}" +MACHINE_KERNEL_PR_append = "e+gitr${SRCPV}" BRANCH = "v3.2-staging" @@ -34,7 +34,6 @@ KERNEL_PATCHES = "${PATCHES}" # Add a set of patches that enabled features, fixed bugs or disabled buggy features # that weren't part of the official PSP release PATCHES = "file://0001-musb-update-PIO-mode-help-information-in-Kconfig.patch \ - file://0001-am335x_evm_defconfig-turn-off-MUSB-DMA.patch \ file://0001-mach-omap2-pm33xx-Disable-VT-switch.patch" # Add Cryptography support early driver patches while working to get the driver -- cgit v1.2.3-54-g00ecf