X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=arch%2Farm%2Finclude%2Fasm%2Fimx-common%2Fdma.h;h=0244947b6e0dc7ccd8d28b7f7c3e9e7937a9de77;hb=7b54f5a8bf13f64a019b0dd108c80c44023c98c8;hp=7d421b3967cfb8295abfa4cb84d8f0d048879a5f;hpb=9bea236b3402a262772b66d055ec6431cbd3ba87;p=u-boot

diff --git a/arch/arm/include/asm/imx-common/dma.h b/arch/arm/include/asm/imx-common/dma.h
index 7d421b3967..0244947b6e 100644
--- a/arch/arm/include/asm/imx-common/dma.h
+++ b/arch/arm/include/asm/imx-common/dma.h
@@ -16,12 +16,7 @@
 #include <linux/list.h>
 #include <linux/compiler.h>
 
-#ifndef	CONFIG_ARCH_DMA_PIO_WORDS
-#define	DMA_PIO_WORDS		15
-#else
-#define	DMA_PIO_WORDS		CONFIG_ARCH_DMA_PIO_WORDS
-#endif
-
+#define DMA_PIO_WORDS		15
 #define MXS_DMA_ALIGNMENT	ARCH_DMA_MINALIGN
 
 /*
@@ -59,7 +54,7 @@ enum {
 	MXS_DMA_CHANNEL_AHB_APBH_RESERVED1,
 	MXS_MAX_DMA_CHANNELS,
 };
-#elif defined(CONFIG_MX6)
+#elif defined(CONFIG_MX6) || defined(CONFIG_MX7)
 enum {
 	MXS_DMA_CHANNEL_AHB_APBH_GPMI0 = 0,
 	MXS_DMA_CHANNEL_AHB_APBH_GPMI1,