ARM: dts: exynos: enable MFC device for all boards

MFC device can be used without any external hardware dependencies (when
IOMMU is enabled), so it can be enabled by default (like it has been
already done for Exynos 542x platforms). This unifies handling of this
device for Exynos3250, Exynos4 and Exynos542x platforms. Board can still
include exynos-mfc-reserved-memory.dtsi to enable using this device
without IOMMU being enabled.

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

diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index e422819591dcb32e33b27a4f2ef6a94057961e4b..a92181368e5b4cd5e45bc22e4c61dbcbcfe3af31 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -632,10 +632,6 @@
        status = "okay";
 };
 
-&mfc {
-       status = "okay";
-};
-
 &jpeg {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 62f3dcd9e046c3dc526d81a8bd70a575be99487f..70e3aceab3a9349fdf2caf98f42c96c772b312d2 100644 (file)
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -431,7 +431,6 @@
                        clocks = <&cmu CLK_MFC>, <&cmu CLK_SCLK_MFC>;
                        power-domains = <&pd_mfc>;
                        iommus = <&sysmmu_mfc>;
-                       status = "disabled";
                };
 
                sysmmu_mfc: sysmmu@13620000 {

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index ca8f3e3cf2f32d166494b83404d9717d3ad217f1..32f22e12c70bcd1856ec81887c977312f2e91c65 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -428,7 +428,6 @@
                clock-names = "mfc", "sclk_mfc";
                iommus = <&sysmmu_mfc_l>, <&sysmmu_mfc_r>;
                iommu-names = "left", "right";
-               status = "disabled";
        };
 
        serial_0: serial@13800000 {

diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts
index 07a00dd2655a4cb5a27b96591345faaccaf5f608..be2751eebaf84484bfb6281701876972b500e77a 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -288,10 +288,6 @@
        };
 };
 
-&mfc {
-       status = "okay";
-};
-
 &sdhci_0 {
        bus-width = <4>;
        pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>;

diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index 2fab0723c0a4a1afdbe7ec95b4f84864c362a396..847fae3dd1f1ea965e0756f5899815f132a62234 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -133,10 +133,6 @@
        };
 };
 
-&mfc {
-       status = "okay";
-};
-
 &pinctrl_1 {
        keypad_rows: keypad-rows {
                samsung,pins = "gpx2-0", "gpx2-1";

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 1f368786514dc0815f22817fe15741728b09c694..c32a62ef5c6a38ac45db13620c9310a74e5fcd25 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -500,10 +500,6 @@
        clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
 };
 
-&mfc {
-       status = "okay";
-};
-
 &mixer {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 35988a68f8d4ef0a0245b6675d9856dfb50a466d..a5f1476ec28ce073a5653f2ed4fefd63be7cda97 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -466,10 +466,6 @@
        };
 };
 
-&mfc {
-       status = "okay";
-};
-
 &mshc_0 {
        pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index d4f9383101b6c4993fb86c821f981d7a97f2c0d8..231ffbdbf9d0e3c7a5afd07fc981ecfad61ef6a0 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -112,10 +112,6 @@
        };
 };
 
-&mfc {
-       status = "okay";
-};
-
 &pinctrl_1 {
        keypad_rows: keypad-rows {
                samsung,pins = "gpx2-0", "gpx2-1", "gpx2-2";