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

Commit c811f855 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add support for HDMI Tx controller on apq8084"

parents 8a6fece9 0a09788b

arch/arm/boot/dts/apq8084-cdp.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,17 @@ 
	};

};



&pma8084_mpps {

	mpp@a200 { /* MPP 3 */

		/* ext_5v enable */

		qcom,mode = <1>;

		qcom,invert = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

	};

};



&soc {

};

arch/arm/boot/dts/apq8084-liquid.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -16,6 +16,17 @@ 
	};

};



&pma8084_mpps {

	mpp@a200 { /* MPP 3 */

		/* ext_5v enable */

		qcom,mode = <1>;

		qcom,invert = <0>;

		qcom,vin-sel = <2>;

		qcom,src-sel = <0>;

		qcom,master-en = <1>;

	};

};



&soc {

};

arch/arm/boot/dts/apq8084-mdss.dtsi

+29 −0
Original line number Diff line number Diff line
@@ -177,6 +177,35 @@ 
		qcom,mdss-fb-map = <&mdss_fb0>;

	};



	mdss_hdmi_tx: qcom,hdmi_tx@fd922100 {

		cell-index = <0>;

		compatible = "qcom,hdmi-tx";

		reg =	<0xfd922100 0x380>,

			<0xfd922500 0x7C>,

			<0xfc4b8000 0x6100>;

		reg-names = "core_physical", "phy_physical", "qfprom_physical";



		hpd-gdsc-supply = <&gdsc_mdss>;

		hpd-5v-supply = <&pma8084_mvs1>;

		core-vdda-supply = <&pma8084_l12>;

		core-vcc-supply = <&pma8084_s4>;

		qcom,supply-names = "hpd-gdsc", "hpd-5v", "core-vdda", "core-vcc";

		qcom,min-voltage-level = <0 0 1800000 1800000>;

		qcom,max-voltage-level = <0 0 1800000 1800000>;

		qcom,enable-load = <0 0 300000 0>;

		qcom,disable-load = <0 0 0 0>;



		qcom,hdmi-tx-cec = <&msmgpio 31 0>;

		qcom,hdmi-tx-ddc-clk = <&msmgpio 32 0>;

		qcom,hdmi-tx-ddc-data = <&msmgpio 33 0>;

		qcom,hdmi-tx-hpd = <&msmgpio 34 0>;

		qcom,hdmi-tx-ext-5v = <&pma8084_mpps 3 0>;

		qcom,mdss-fb-map = <&mdss_fb1>;

		qcom,msm-hdmi-audio-rx {

			compatible = "qcom,msm-hdmi-audio-codec-rx";

		};

	};



	qcom,mdss_wb_panel {

		compatible = "qcom,mdss_wb";

		qcom,mdss_pan_res = <1920 1080>;

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

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
};



&soc {

	qcom,hdmi_tx@fd922100 {

		status = "disabled";

	};

};



/include/ "dsi-panel-jdi-1080p-video.dtsi"