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

Commit ca049648 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: update the regulator/GPIO nodes for display on QM215"

parents 01b1ed4f 174476f3

arch/arm64/boot/dts/qcom/qm215-pm8916.dtsi

+16 −3
Original line number Original line Diff line number Diff line
@@ -114,9 +114,8 @@ 
		backlight_pwm_en_default: backlight_pwm_en_default {

		backlight_pwm_en_default: backlight_pwm_en_default {

			pins = "mpp4";

			pins = "mpp4";

			function = "digital";

			function = "digital";

			qcom,dtest = <1>;

			power-source = <0>;

			power-source = <0>;

			output-low;

			output-high;

		};

		};

	};

	};

};

};
@@ -147,7 +146,7 @@ 
};

};





&mdss_dsi {

&mdss_dsi {

	vdda-supply = <&disp_vdda_eldo1>;

	vdda-supply = <&pm8916_l6>;

	vddio-supply = <&pm8916_l6>;

	vddio-supply = <&pm8916_l6>;





	qcom,phy-supply-entries {

	qcom,phy-supply-entries {
@@ -163,4 +162,18 @@ 
			qcom,supply-disable-load = <100>;

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

		};

		};

	};

	};



	qcom,ctrl-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;



		qcom,ctrl-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdda";

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

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

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

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

		};

	};

};
 
};

arch/arm64/boot/dts/qcom/qm215-qrd.dtsi

+5 −5
Original line number Original line Diff line number Diff line
@@ -59,12 +59,12 @@ 




&mdss_dsi_active {

&mdss_dsi_active {

	mux {

	mux {

		pins = "gpio61", "gpio93", "gpio94";

		pins = "gpio60", "gpio93", "gpio94";

		function = "gpio";

		function = "gpio";

	};

	};





	config {

	config {

		pins = "gpio61", "gpio93", "gpio94";

		pins = "gpio60", "gpio93", "gpio94";

		drive-strength = <8>; /* 8 mA */

		drive-strength = <8>; /* 8 mA */

		bias-disable = <0>; /* no pull */

		bias-disable = <0>; /* no pull */

		output-high;

		output-high;
@@ -73,12 +73,12 @@ 




&mdss_dsi_suspend {

&mdss_dsi_suspend {

	mux {

	mux {

		pins = "gpio61", "gpio93", "gpio94";

		pins = "gpio60", "gpio93", "gpio94";

		function = "gpio";

		function = "gpio";

	};

	};





	config {

	config {

		pins = "gpio61", "gpio93", "gpio94";

		pins = "gpio60", "gpio93", "gpio94";

		drive-strength = <2>; /* 2 mA */

		drive-strength = <2>; /* 2 mA */

		bias-pull-down; /* pull down */

		bias-pull-down; /* pull down */

	};

	};
@@ -119,7 +119,7 @@ 
	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;

	pinctrl-1 = <&mdss_dsi_suspend &mdss_te_suspend>;





	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-te-gpio = <&tlmm 24 0>;

	qcom,platform-reset-gpio = <&tlmm 61 0>;

	qcom,platform-reset-gpio = <&tlmm 60 0>;

	qcom,platform-bklight-en-gpio = <&tlmm 93 0>;

	qcom,platform-bklight-en-gpio = <&tlmm 93 0>;

	qcom,platform-enable-gpio = <&tlmm 94 0>;

	qcom,platform-enable-gpio = <&tlmm 94 0>;

};

};