ARM: dts: exynos: Add status property to Exynos 5250 HDMI and Mixer nodes

HDMI support requires some additional off-SoC logic, so HDMI and Mixer
devices should be disabled by default in SoC dtsi and enabled then
in each board dts. This patch unifies HDMI and 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/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index a380cff..0efd678 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -152,6 +152,7 @@
 };
 
 &hdmi {
+       status = "okay";
        ddc = <&i2c_2>;
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_LOW>;
        vdd_osc-supply = <&ldo10_reg>;
@@ -505,6 +506,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &mmc_0 {
        status = "okay";
        broken-cd;

diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 1330ded..e98e62c 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -116,6 +116,7 @@
 };
 
 &hdmi {
+       status = "okay";
        ddc = <&i2c_2>;
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
 };
@@ -337,6 +338,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &mmc_0 {
        status = "okay";
        broken-cd;

diff --git a/arch/arm/boot/dts/exynos5250-snow-common.dtsi b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
index 88a8656..11e6cfd 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi
+++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi
@@ -261,6 +261,7 @@
 };
 
 &hdmi {
+       status = "okay";
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
@@ -518,6 +519,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 /* eMMC flash */
 &mmc_0 {
        status = "okay";

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index b3cc225..47dbc50 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -91,6 +91,7 @@
 };
 
 &hdmi {
+       status = "okay";
        hpd-gpios = <&gpx3 7 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&hdmi_hpd_irq>;
@@ -416,6 +417,10 @@
        status = "okay";
 };
 
+&mixer {
+       status = "okay";
+};
+
 &mmc_0 {
        status = "okay";
        broken-cd;

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 7048609..d1f3143 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -693,6 +693,7 @@
                                        "sclk_hdmiphy", "mout_hdmi";
                        samsung,syscon-phandle = <&pmu_system_controller>;
                        phy = <&hdmiphy>;
+                       status = "disabled";
                };
 
                hdmicec: cec@101B0000 {
@@ -708,7 +709,7 @@
                        status = "disabled";
                };
 
-               mixer@14450000 {
+               mixer: mixer@14450000 {
                        compatible = "samsung,exynos5250-mixer";
                        reg = <0x14450000 0x10000>;
                        power-domains = <&pd_disp1>;
@@ -717,6 +718,7 @@
                                 <&clock CLK_SCLK_HDMI>;
                        clock-names = "mixer", "hdmi", "sclk_hdmi";
                        iommus = <&sysmmu_tv>;
+                       status = "disabled";
                };
 
                dp_phy: video-phy {