2 files changed, 6 insertions, 4 deletions

diff --git a/include/linux/platform_data/dma-atmel.h b/include/linux/platform_data/dma-atmel.h
index cab0997be3de..e95f19c65873 100644
--- a/include/linux/platform_data/dma-atmel.h
+++ b/include/linux/platform_data/dma-atmel.h
@@ -35,16 +35,20 @@ struct at_dma_slave {
 
 
 /* Platform-configurable bits in CFG */
+#define ATC_PER_MSB(h)  ((0x30U & (h)) >> 4)    /* Extract most significant bits of a handshaking identifier */
+
 #define ATC_SRC_PER(h)          (0xFU & (h))    /* Channel src rq associated with periph handshaking ifc h */
 #define ATC_DST_PER(h)          ((0xFU & (h)) <<  4)    /* Channel dst rq associated with periph handshaking ifc h */
 #define ATC_SRC_REP             (0x1 <<  8)     /* Source Replay Mod */
 #define ATC_SRC_H2SEL           (0x1 <<  9)     /* Source Handshaking Mod */
 #define         ATC_SRC_H2SEL_SW        (0x0 <<  9)
 #define         ATC_SRC_H2SEL_HW        (0x1 <<  9)
+#define ATC_SRC_PER_MSB(h)      (ATC_PER_MSB(h) << 10)  /* Channel src rq (most significant bits) */
 #define ATC_DST_REP             (0x1 << 12)     /* Destination Replay Mod */
 #define ATC_DST_H2SEL           (0x1 << 13)     /* Destination Handshaking Mod */
 #define         ATC_DST_H2SEL_SW        (0x0 << 13)
 #define         ATC_DST_H2SEL_HW        (0x1 << 13)
+#define ATC_DST_PER_MSB(h)      (ATC_PER_MSB(h) << 14)  /* Channel dst rq (most significant bits) */
 #define ATC_SOD                 (0x1 << 16)     /* Stop On Done */
 #define ATC_LOCK_IF             (0x1 << 20)     /* Interface Lock */
 #define ATC_LOCK_B              (0x1 << 21)     /* AHB Bus Lock */
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
index f6d30cc1cb77..beac6b8b6a7b 100644
--- a/include/linux/platform_data/dma-imx.h
+++ b/include/linux/platform_data/dma-imx.h
@@ -60,10 +60,8 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan)
 
 static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
 {
-        return strstr(dev_name(chan->device->dev), "sdma") ||
-                !strcmp(dev_name(chan->device->dev), "imx1-dma") ||
-                !strcmp(dev_name(chan->device->dev), "imx21-dma") ||
-                !strcmp(dev_name(chan->device->dev), "imx27-dma");
+        return !strcmp(chan->device->dev->driver->name, "imx-sdma") ||
+                !strcmp(chan->device->dev->driver->name, "imx-dma");
 }
 
 #endif