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 a380cff466aef7726afb03358e77b52ef28fc37b..0efd678b8251933c7555871cc810596d0112b3cc 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 1330ded91445f2e93b4012ccde5117684b04834a..e98e62c1216c2a2d798b3dcc2c60568d42a50c71 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 88a8656ca7b3e84dbf28722ca6807a01034e32cc..11e6cfdc0f68fa8a7137908fad6ef3a482a1db65 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 b3cc22568033693b2db3e8abde35b8098c6d0cce..47dbc50546c104d8fc9e8e8c15201409b50a0913 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 7048609f37319446d2048d8dde61eac92c5c54e4..d1f3143d2cf8dd38adb6b8eaa43206aa1554c4a7 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 {