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

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

Merge "mdss:display: add regulator control to dsi-1"

parents 0e50cfa5 36763b2e

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

+36 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 
		vddio-supply = <&pma8084_l12>;

		vdda-supply = <&pma8084_l2>;

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

		qcom,mdss-mdp = <&mdss_mdp>;



		qcom,platform-strength-ctrl = [ff 06];

		qcom,platform-bist-ctrl = [00 00 b1 ff 00 00];

		qcom,platform-regulator-settings = [07 09 03 00 20 00 01];
@@ -191,6 +193,40 @@ 
			00 00 00 00 0a 00 00 01 97

			00 00 00 00 0f 00 00 01 97

			00 c0 00 00 00 00 00 01 bb];



		qcom,platform-supply-entry1 {

			qcom,supply-name = "vdd";

			qcom,supply-min-voltage = <3000000>;

			qcom,supply-max-voltage = <3000000>;

			qcom,supply-enable-load = <150000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

		qcom,platform-supply-entry2 {

			qcom,supply-name = "vddio";

			qcom,supply-min-voltage = <1800000>;

			qcom,supply-max-voltage = <1800000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <20>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

		qcom,platform-supply-entry3 {

			qcom,supply-name = "vdda";

			qcom,supply-min-voltage = <1200000>;

			qcom,supply-max-voltage = <1200000>;

			qcom,supply-enable-load = <100000>;

			qcom,supply-disable-load = <100>;

			qcom,supply-pre-on-sleep = <0>;

			qcom,supply-post-on-sleep = <0>;

			qcom,supply-pre-off-sleep = <0>;

			qcom,supply-post-off-sleep = <0>;

		};

	};



	mdss_hdmi_tx: qcom,hdmi_tx@fd922100 {

arch/arm/boot/dts/qti/msm8974-mdss.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -160,6 +160,47 @@ 
		vdda-supply = <&pm8941_l2>;

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

		qcom,mdss-mdp = <&mdss_mdp>;

		qcom,platform-strength-ctrl = [ff 06];

		qcom,platform-bist-ctrl = [00 00 b1 ff 00 00];

		qcom,platform-regulator-settings = [07 09 03 00 20 00 01];

		qcom,platform-lane-config = [00 00 00 00 00 00 00 01 97

			00 00 00 00 05 00 00 01 97

			00 00 00 00 0a 00 00 01 97

			00 00 00 00 0f 00 00 01 97

			00 c0 00 00 00 00 00 01 bb];

		qcom,platform-supply-entry1 {

				qcom,supply-name = "vdd";

				qcom,supply-min-voltage = <3000000>;

				qcom,supply-max-voltage = <3000000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

				qcom,supply-pre-off-sleep = <0>;

				qcom,supply-post-off-sleep = <0>;

		};

		qcom,platform-supply-entry2 {

				qcom,supply-name = "vddio";

				qcom,supply-min-voltage = <1800000>;

				qcom,supply-max-voltage = <1800000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <20>;

				qcom,supply-pre-off-sleep = <0>;

				qcom,supply-post-off-sleep = <0>;

		};

		qcom,platform-supply-entry3 {

				qcom,supply-name = "vdda";

				qcom,supply-min-voltage = <1200000>;

				qcom,supply-max-voltage = <1200000>;

				qcom,supply-enable-load = <100000>;

				qcom,supply-disable-load = <100>;

				qcom,supply-pre-on-sleep = <0>;

				qcom,supply-post-on-sleep = <0>;

				qcom,supply-pre-off-sleep = <0>;

				qcom,supply-post-off-sleep = <0>;

		};

	};



	mdss_hdmi_tx: qcom,hdmi_tx@fd922100 {