Message ID | 1395046487-21249-1-git-send-email-sachin.kamat@linaro.org |
---|---|
State | Accepted |
Headers | show |
Sachin Kamat wrote: > > Reserve memory for MFC-v7 IP. > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > --- > Based on top of Tushar's patch: > [PATCH V2] ARM: SAMSUNG: Reorganize calls to reserve memory for MFC > http://www.spinics.net/lists/linux-samsung-soc/msg25501.html > --- > arch/arm/mach-exynos/mach-exynos5-dt.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach- > exynos5-dt.c > index 9586439b2d0e..9a8a798d2ad0 100644 > --- a/arch/arm/mach-exynos/mach-exynos5-dt.c > +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c > @@ -59,7 +59,15 @@ static char const *exynos5_dt_compat[] __initdata = { > static void __init exynos5_reserve(void) > { > #ifdef CONFIG_S5P_DEV_MFC > - of_scan_flat_dt(s5p_fdt_alloc_mfc_mem, "samsung,mfc-v6"); > + int i; > + char *mfc_mem[] = { > + "samsung,mfc-v6", > + "samsung,mfc-v7", > + }; > + > + for (i = 0; i < ARRAY_SIZE(mfc_mem); i++) > + if (of_scan_flat_dt(s5p_fdt_alloc_mfc_mem, mfc_mem[i])) > + break; > #endif > } > > -- > 1.7.9.5 Looks OK, will apply. Thanks, Kukjin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 9586439b2d0e..9a8a798d2ad0 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -59,7 +59,15 @@ static char const *exynos5_dt_compat[] __initdata = { static void __init exynos5_reserve(void) { #ifdef CONFIG_S5P_DEV_MFC - of_scan_flat_dt(s5p_fdt_alloc_mfc_mem, "samsung,mfc-v6"); + int i; + char *mfc_mem[] = { + "samsung,mfc-v6", + "samsung,mfc-v7", + }; + + for (i = 0; i < ARRAY_SIZE(mfc_mem); i++) + if (of_scan_flat_dt(s5p_fdt_alloc_mfc_mem, mfc_mem[i])) + break; #endif }
Reserve memory for MFC-v7 IP. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- Based on top of Tushar's patch: [PATCH V2] ARM: SAMSUNG: Reorganize calls to reserve memory for MFC http://www.spinics.net/lists/linux-samsung-soc/msg25501.html --- arch/arm/mach-exynos/mach-exynos5-dt.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)