ARM: SAMSUNG: Reorganize calls to reserve memory for MFC

Reorganize code so that "plat/mfc.h" is no more referred
from mach-exynos directory.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm/plat-samsung/include/plat/mfc.h b/arch/arm/plat-samsung/include/plat/mfc.h
index e6d7c42d68b6..033654e91e22 100644
--- a/arch/arm/plat-samsung/include/plat/mfc.h
+++ b/arch/arm/plat-samsung/include/plat/mfc.h
@@ -32,7 +32,4 @@ struct s5p_mfc_dt_meminfo {
 void __init s5p_mfc_reserve_mem(phys_addr_t rbase, unsigned int rsize,
                                 phys_addr_t lbase, unsigned int lsize);
 
-int __init s5p_fdt_find_mfc_mem(unsigned long node, const char *uname,
-                                int depth, void *data);
-
 #endif /* __PLAT_SAMSUNG_MFC_H */
diff --git a/arch/arm/plat-samsung/s5p-dev-mfc.c b/arch/arm/plat-samsung/s5p-dev-mfc.c
index ad51f85fbd01..98087b655df0 100644
--- a/arch/arm/plat-samsung/s5p-dev-mfc.c
+++ b/arch/arm/plat-samsung/s5p-dev-mfc.c
@@ -122,32 +122,35 @@ device_initcall(s5p_mfc_memory_init);
 #endif
 
 #ifdef CONFIG_OF
-int __init s5p_fdt_find_mfc_mem(unsigned long node, const char *uname,
+int __init s5p_fdt_alloc_mfc_mem(unsigned long node, const char *uname,
                                 int depth, void *data)
 {
         __be32 *prop;
         unsigned long len;
-        struct s5p_mfc_dt_meminfo *mfc_mem = data;
+        struct s5p_mfc_dt_meminfo mfc_mem;
 
         if (!data)
                 return 0;
 
-        if (!of_flat_dt_is_compatible(node, mfc_mem->compatible))
+        if (!of_flat_dt_is_compatible(node, data))
                 return 0;
 
         prop = of_get_flat_dt_prop(node, "samsung,mfc-l", &len);
         if (!prop || (len != 2 * sizeof(unsigned long)))
                 return 0;
 
-        mfc_mem->loff = be32_to_cpu(prop[0]);
-        mfc_mem->lsize = be32_to_cpu(prop[1]);
+        mfc_mem.loff = be32_to_cpu(prop[0]);
+        mfc_mem.lsize = be32_to_cpu(prop[1]);
 
         prop = of_get_flat_dt_prop(node, "samsung,mfc-r", &len);
         if (!prop || (len != 2 * sizeof(unsigned long)))
                 return 0;
 
-        mfc_mem->roff = be32_to_cpu(prop[0]);
-        mfc_mem->rsize = be32_to_cpu(prop[1]);
+        mfc_mem.roff = be32_to_cpu(prop[0]);
+        mfc_mem.rsize = be32_to_cpu(prop[1]);
+
+        s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize,
+                        mfc_mem.loff, mfc_mem.lsize);
 
         return 1;
 }