ARM: dts: exynos: Add status property to Exynos 542x Mixer nodes

HDMI support requires some additional off-SoC logic, so Mixer device (part
of HDMI display path) should be disabled by default in SoC dtsi and enabled
then in each board dts. This patch unifies Mixer handling with other
Exynos SoCs.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index ee1bb9b8b36681aa95f67b0bc02a23e40b35ec05..b0ac10f124e68db24b77cec7f27890ae8b728d47 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -360,6 +360,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &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 683a4cfb4a23d469ba91670f414e27ea03d57f5a..38af8769711c28a571c09314f3040601de6e2e92 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-peach-pit.dts
+++ b/arch/arm/boot/dts/exynos5420-peach-pit.dts
@@ -696,6 +696,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 /* eMMC flash */
 &mmc_0 {
        status = "okay";

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index cc44dc60d81e6b38d06072cfa00c9d25f15b29a3..310d8637ce9f400c8ff2d89f0ce59d40030f9d17 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -352,6 +352,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &mmc_0 {
        status = "okay";
        broken-cd;

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 6166730215dbd17e9e652748194c16ffbbcde3f6..88e5d6d3f90163109ff94564693dce8aaae45f7d 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -646,6 +646,7 @@
                        clock-names = "mixer", "hdmi", "sclk_hdmi";
                        power-domains = <&disp_pd>;
                        iommus = <&sysmmu_tv>;
+                       status = "disabled";
                };
 
                rotator: rotator@11C00000 {

diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
index 9b65d39c6b0e44f8d6396c15e6fa6b80f260fc1e..305c2a2b728c712f704d145d14f926a0cb63ecb2 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
@@ -729,6 +729,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &mmc_0 {
        status = "okay";
        mmc-pwrseq = <&emmc_pwrseq>;