Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e96849e3 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Krzysztof Kozlowski
Browse files

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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent c9c51fd2

arch/arm/boot/dts/exynos5250-arndale.dts

+5 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/exynos5250-smdk5250.dts

+5 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/exynos5250-snow-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -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";

arch/arm/boot/dts/exynos5250-spring.dts

+5 −0
Original line number Diff line number Diff line
@@ -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;

arch/arm/boot/dts/exynos5250.dtsi

+3 −1
Original line number Diff line number Diff line
@@ -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 {