2 files changed, 28 insertions, 3 deletions

diff --git a/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
index 5fbde4b8dc12..ee5d8b2e46dd 100644
--- a/arch/arm/plat-nomadik/include/plat/ste_dma40.h
+++ b/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -98,7 +98,7 @@ struct stedma40_half_channel_info {
 };
 
 enum stedma40_xfer_dir {
-        STEDMA40_MEM_TO_MEM,
+        STEDMA40_MEM_TO_MEM = 1,
         STEDMA40_MEM_TO_PERIPH,
         STEDMA40_PERIPH_TO_MEM,
         STEDMA40_PERIPH_TO_PERIPH
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 17e2600a00cf..df2e1a30ee7e 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -981,14 +981,39 @@ static int d40_validate_conf(struct d40_chan *d40c,
         bool is_log = (conf->channel_type & STEDMA40_CHANNEL_IN_OPER_MODE)
                 == STEDMA40_CHANNEL_IN_LOG_MODE;
 
-        if (d40c->dma_cfg.dir == STEDMA40_MEM_TO_PERIPH &&
+        if (!conf->dir) {
+                dev_err(&d40c->chan.dev->device, "[%s] Invalid direction.\n",
+                        __func__);
+                res = -EINVAL;
+        }
+
+        if (conf->dst_dev_type != STEDMA40_DEV_DST_MEMORY &&
+            d40c->base->plat_data->dev_tx[conf->dst_dev_type] == 0 &&
+            d40c->runtime_addr == 0) {
+
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] Invalid TX channel address (%d)\n",
+                        __func__, conf->dst_dev_type);
+                res = -EINVAL;
+        }
+
+        if (conf->src_dev_type != STEDMA40_DEV_SRC_MEMORY &&
+            d40c->base->plat_data->dev_rx[conf->src_dev_type] == 0 &&
+            d40c->runtime_addr == 0) {
+                dev_err(&d40c->chan.dev->device,
+                        "[%s] Invalid RX channel address (%d)\n",
+                        __func__, conf->src_dev_type);
+                res = -EINVAL;
+        }
+
+        if (conf->dir == STEDMA40_MEM_TO_PERIPH &&
             dst_event_group == STEDMA40_DEV_DST_MEMORY) {
                 dev_err(&d40c->chan.dev->device, "[%s] Invalid dst\n",
                         __func__);
                 res = -EINVAL;
         }
 
-        if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM &&
+        if (conf->dir == STEDMA40_PERIPH_TO_MEM &&
             src_event_group == STEDMA40_DEV_SRC_MEMORY) {
                 dev_err(&d40c->chan.dev->device, "[%s] Invalid src\n",
                         __func__);