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

Commit 897922f5 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 panel TE source information for SM8150" into dev/msm-4.14-display

parents a6c9b263 66dd8097

arch/arm64/boot/dts/qcom/sm8150-sde-display.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ 
		pinctrl-1 = <&sde_dsi_suspend &sde_te_suspend>;



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

		qcom,panel-te-source = <0>;



		vddio-supply = <&pm8150_l14>;

		lab-supply = <&lcdb_ldo_vreg>;
@@ -411,6 +412,7 @@ 
		pinctrl-1 = <&sde_dsi1_suspend &sde_te1_suspend>;



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

		qcom,panel-te-source = <1>;



		vddio-supply = <&pm8150_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

arch/arm64/boot/dts/qcom/sm8150-sde.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ 
		qcom,sde-pp-slave = <0x0 0x0 0x0 0x0 0x0 0x0>;

		qcom,sde-pp-size = <0xd4>;

		qcom,sde-pp-merge-3d-id = <0x0 0x0 0x1 0x1 0x2 0x2>;

		qcom,sde-te-source = <0x0 0x1 0x0 0x0 0x0>;



		qcom,sde-merge-3d-off = <0x84000 0x84100 0x84200>;

		qcom,sde-merge-3d-size = <0x100>;