Merge branch 'dma-contig-for-7.1-modules-prep-v4' into dma-mapping-for-next

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

diff --cc include/linux/dma-map-ops.h
Simple merge

diff --cc kernel/dma/contiguous.c
index 65d216663e81dd9c52b7dc38b673e7f5cfc07d32,83a5bd9488e1448cc72e92ed204ce804164cc6b8..03f52bd1712062ca0db1ea87d7d4239559aae86d
--- 1/kernel/dma/contiguous.c
--- 2/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@@ -91,6 -121,25 +121,15 @@@ static int __init early_cma(char *p
  }
  early_param("cma", early_cma);
  
 -/*
 - * cma_skip_dt_default_reserved_mem - This is called from the
 - * reserved_mem framework to detect if the default cma region is being
 - * set by the "cma=" kernel parameter.
 - */
 -bool __init cma_skip_dt_default_reserved_mem(void)
 -{
 -      return size_cmdline != -1;
 -}
 -
+ struct cma *dev_get_cma_area(struct device *dev)
+ {
+       if (dev && dev->cma_area)
+               return dev->cma_area;
+ 
+       return dma_contiguous_default_area;
+ }
+ EXPORT_SYMBOL_GPL(dev_get_cma_area);
+ 
  #ifdef CONFIG_DMA_NUMA_CMA
  
  static struct cma *dma_contiguous_numa_area[MAX_NUMNODES];
@@@ -529,9 -560,9 +583,9 @@@ static int __init rmem_cma_setup(unsign
        pr_info("Reserved memory: created CMA memory pool at %pa, size %ld MiB\n",
                &rmem->base, (unsigned long)rmem->size / SZ_1M);
  
-       ret = dma_heap_cma_register_heap(cma);
 -      err = dma_contiguous_insert_area(cma);
 -      if (err)
++      ret = dma_contiguous_insert_area(cma);
 +      if (ret)
-               pr_warn("Couldn't register CMA heap.");
+               pr_warn("Couldn't store CMA reserved area.");
  
        return 0;
  }