Merge "ARM: dts: msm: conditional power on feature for HDMI" (64574dee) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

arch/arm/boot/dts/qcom/apq8084-mtp.dtsi

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,10 +26,6 @@
		};

		&soc {
		qcom,hdmi_tx@fd922100 {
		status = "disabled";
		};

		sound {
		qcom,model = "apq8084-taiko-mtp-snd-card";

		@@ -111,6 +107,10 @@
		};
		};

		&mdss_hdmi_tx {
		qcom,conditional-power-on;
		};

		#include "dsi-panel-jdi-1080p-video.dtsi"
		&dsi_jdi_1080_vid {
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_pwm";