Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / plat-mxc / include / mach / dma.h

diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h
index 233d0a5e2d68f1451b29ce18e331a384fabaf5a5..1b9080385b4618b2b3c76ab057a7bf271df8d73d 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/dma.h
+++ b/arch/arm/plat-mxc/include/mach/dma.h
@@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan)
 
 static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
 {
-       return !strcmp(dev_name(chan->device->dev), "imx31-sdma") ||
-               !strcmp(dev_name(chan->device->dev), "imx35-sdma") ||
+       return strstr(dev_name(chan->device->dev), "sdma") ||
                !strcmp(dev_name(chan->device->dev), "imx-dma");
 }