[media] coda: allow running coda without iram on mx6dl

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

2 files changed, 10 insertions, 7 deletions

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index cc9afb733b48..fddd10d53558 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -474,6 +474,9 @@ static void coda_setup_iram(struct coda_ctx *ctx)
         iram_info->next_paddr = dev->iram.paddr;
         iram_info->remaining = dev->iram.size;
 
+        if (!dev->iram.vaddr)
+                return;
+
         switch (dev->devtype->product) {
         case CODA_7541:
                 dbk_bits = CODA7_USE_HOST_DBK_ENABLE | CODA7_USE_DBK_ENABLE;
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 4e85e387f905..3bf30b8215dd 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1947,15 +1947,15 @@ static int coda_probe(struct platform_device *pdev)
         dev->iram.vaddr = gen_pool_dma_alloc(dev->iram_pool, dev->iram.size,
                                              &dev->iram.paddr);
         if (!dev->iram.vaddr) {
-                dev_err(&pdev->dev, "unable to alloc iram\n");
-                return -ENOMEM;
+                dev_warn(&pdev->dev, "unable to alloc iram\n");
+        } else {
+                dev->iram.blob.data = dev->iram.vaddr;
+                dev->iram.blob.size = dev->iram.size;
+                dev->iram.dentry = debugfs_create_blob("iram", 0644,
+                                                       dev->debugfs_root,
+                                                       &dev->iram.blob);
         }
 
-        dev->iram.blob.data = dev->iram.vaddr;
-        dev->iram.blob.size = dev->iram.size;
-        dev->iram.dentry = debugfs_create_blob("iram", 0644, dev->debugfs_root,
-                                               &dev->iram.blob);
-
         dev->workqueue = alloc_workqueue("coda", WQ_UNBOUND | WQ_MEM_RECLAIM, 1);
         if (!dev->workqueue) {
                 dev_err(&pdev->dev, "unable to alloc workqueue\n");