ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi

This patch moves assigning reserved memory regions from each board dts
to common exynos-mfc-reserved-memory.dtsi file, where those regions are
defined.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

diff --git a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
index da3ced99ffa2baa3ffe6f9aec45608c976af4712..f78c14c82e178857a33183a4a724d5015bc39eca 100644 (file)
--- a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
+++ b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
@@ -29,3 +29,7 @@
                };
        };
 };
+
+&mfc {
+       memory-region = <&mfc_left>, <&mfc_right>;
+};

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index f5e4eb23aa214ea82bb8be8b9df159cb5593607a..07a00dd2655a4cb5a27b96591345faaccaf5f608 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -289,7 +289,6 @@
 };
 
 &mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index de917f0d907d73721db384bffa5c076710f514fe..2fab0723c0a4a1afdbe7ec95b4f84864c362a396 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -134,7 +134,6 @@
 };
 
 &mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 276ac9a7bb829f37f92df5d3f47423759535299d..1f368786514dc0815f22817fe15741728b09c694 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -501,7 +501,6 @@
 };
 
 &mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index cd363d7e4e34a5cb1e6cd92e59c90435bdf25d18..35988a68f8d4ef0a0245b6675d9856dfb50a466d 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -467,7 +467,6 @@
 };
 
 &mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index 9b6d561dbdace478e81b2d0aad24f52e6e568321..d4f9383101b6c4993fb86c821f981d7a97f2c0d8 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -113,7 +113,6 @@
 };
 
 &mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
        status = "okay";
 };
 

diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 39940f4bd556216dc301d2c75ae9520b08cfc4bb..ea70603f660dba591daa5f7d1bd8ea17f329fde2 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -516,10 +516,6 @@
        status = "okay";
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        num-slots = <1>;

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 9fac874af5eb6f9c85db73bcf38067ff49ab56d5..381af134c4c876bf0b68b8a534e5de576a50ba70 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -344,10 +344,6 @@
        status = "okay";
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        num-slots = <1>;

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 784130bdb6a370f56e6801e4ae4c8fbf9d693c1f..44f4292bfef69db11ffc1dc6112c73d3e198dc9a 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -425,10 +425,6 @@
        status = "okay";
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        num-slots = <1>;

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index b8b5f3ae29422f00923b23f46b2d28d67cf69166..39a3b81478fd3978e1451b86f7c0d90e59c096e0 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -347,10 +347,6 @@
        };
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        broken-cd;

diff --git a/arch/arm/boot/dts/exynos5420-peach-pit.dts b/arch/arm/boot/dts/exynos5420-peach-pit.dts
index d530b4f5f1e9853bbaee12583de42c5a29d9ca12..2f16f33f0feaab6ea6f67bf9043030940907d6ac 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -695,10 +695,6 @@
        status = "okay";
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        num-slots = <1>;

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 5206f41e548dd99f4e4262005fdaa4b90d2d8ba5..ed8f3426911bc4ee69cd2e3011c02f2a39218316 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -355,10 +355,6 @@
        };
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        broken-cd;

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 7c2335f18bfc3690f93c6c3cd4d967f6b7d3bfab..530883c1a4074b45af89952b793e6ca450527d29 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -406,10 +406,6 @@
        };
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        mmc-pwrseq = <&emmc_pwrseq>;

diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts
index 1f735963ca98a279401db9c17be875dd9bc63e52..6085b88ab47de9370f07f296def0a651571dd0ad 100644 (file)
--- a/arch/arm/boot/dts/exynos5800-peach-pi.dts
+++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts
@@ -670,10 +670,6 @@
        status = "okay";
 };
 
-&mfc {
-       memory-region = <&mfc_left>, <&mfc_right>;
-};
-
 &mmc_0 {
        status = "okay";
        num-slots = <1>;