aspeed: Add P-Bus clock in ast2500 clock driver

[oweals/u-boot.git] / arch / arm / include / asm / imx-common / dma.h

diff --git a/arch/arm/include/asm/imx-common/dma.h b/arch/arm/include/asm/imx-common/dma.h
index d5c1f7f255a3c5f6eee70634d6dd747ac5639530..0244947b6e0dc7ccd8d28b7f7c3e9e7937a9de77 100644 (file)
--- a/arch/arm/include/asm/imx-common/dma.h
+++ b/arch/arm/include/asm/imx-common/dma.h
@@ -16,13 +16,8 @@
 #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 MXS_DMA_ALIGNMENT      32
+#define DMA_PIO_WORDS          15
+#define MXS_DMA_ALIGNMENT      ARCH_DMA_MINALIGN
 
 /*
  * MXS DMA channels
@@ -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,