From 4ceaa148b05a3a2d475592f9281b9cbb13882e3c Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Tue, 7 Jun 2016 14:03:37 +0200 Subject: [PATCH] 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 Reviewed-by: Javier Martinez Canillas Tested-by: Javier Martinez Canillas Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi | 4 ++++ arch/arm/boot/dts/exynos4210-origen.dts | 1 - arch/arm/boot/dts/exynos4210-smdkv310.dts | 1 - arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 - arch/arm/boot/dts/exynos4412-origen.dts | 1 - arch/arm/boot/dts/exynos4412-smdk4412.dts | 1 - arch/arm/boot/dts/exynos5250-arndale.dts | 4 ---- arch/arm/boot/dts/exynos5250-smdk5250.dts | 4 ---- arch/arm/boot/dts/exynos5250-spring.dts | 4 ---- arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 ---- arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 ---- arch/arm/boot/dts/exynos5420-smdk5420.dts | 4 ---- arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 4 ---- arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 ---- 14 files changed, 4 insertions(+), 37 deletions(-) diff --git a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi index da3ced99ffa2..f78c14c82e17 100644 --- 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 f5e4eb23aa21..07a00dd2655a 100644 --- 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 de917f0d907d..2fab0723c0a4 100644 --- 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 276ac9a7bb82..1f368786514d 100644 --- 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 cd363d7e4e34..35988a68f8d4 100644 --- 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 9b6d561dbdac..d4f9383101b6 100644 --- 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 39940f4bd556..ea70603f660d 100644 --- 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 9fac874af5eb..381af134c4c8 100644 --- 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 784130bdb6a3..44f4292bfef6 100644 --- 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 b8b5f3ae2942..39a3b81478fd 100644 --- 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 d530b4f5f1e9..2f16f33f0fea 100644 --- 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 5206f41e548d..ed8f3426911b 100644 --- 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 7c2335f18bfc..530883c1a407 100644 --- 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 1f735963ca98..6085b88ab47d 100644 --- 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>; -- 2.20.1