From: Luka Perkov <luka@openwrt.org>
Date: Mon, 9 Dec 2013 11:30:22 +0000 (+0000)
Subject: imx6: add DMA/SDMA support for 3.12
X-Git-Tag: v19.07.0-rc1~19088
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7523aa05c1cc6f1162d0151cc28e46182767bf15;p=openwrt%2Fstaging%2Fhauke.git

imx6: add DMA/SDMA support for 3.12

DMA and SDMA support are needed for ssi based audio.  Note that the sdma
firmware is no longer required for ssi audio.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>

SVN-Revision: 39011
---

diff --git a/target/linux/imx6/config-3.12 b/target/linux/imx6/config-3.12
index dadebfccbd..5ec8eddbd0 100644
--- a/target/linux/imx6/config-3.12
+++ b/target/linux/imx6/config-3.12
@@ -14,8 +14,6 @@ CONFIG_ARCH_MULTI_V7=y
 CONFIG_ARCH_MXC=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_ARCH_NR_GPIO=0
-# CONFIG_ARCH_OMAP3 is not set
-# CONFIG_ARCH_OMAP4 is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
@@ -195,8 +193,8 @@ CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_IMX=y
 # CONFIG_IMX2_WDT is not set
-# CONFIG_IMX_DMA is not set
-# CONFIG_IMX_SDMA is not set
+CONFIG_IMX_DMA=y
+CONFIG_IMX_SDMA=y
 # CONFIG_IMX_WEIM is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y