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

Commit c72aa77f 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: enable AMOLED panel on SDM670"

parents 6da26203 d5fb0803

arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -267,9 +267,7 @@ 
};



&dsi_rm67195_amoled_fhd_cmd {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>;

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

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

arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi

+1 −3
Original line number Diff line number Diff line
@@ -322,9 +322,7 @@ 
};



&dsi_rm67195_amoled_fhd_cmd {

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <4095>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>;

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

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

arch/arm64/boot/dts/qcom/sdm670-pm660a-cdp-overlay.dts

+7 −0
Original line number Diff line number Diff line
@@ -33,3 +33,10 @@ 
		       <0x0001001b 0x0202001a 0x0 0x0>;

};



&dsi_dual_nt35597_truly_video_display {

	/delete-property/ qcom,dsi-display-active;

};



&dsi_rm67195_amoled_fhd_cmd_display {

	qcom,dsi-display-active;

};

arch/arm64/boot/dts/qcom/sdm670-pm660a-cdp.dts

+8 −0
Original line number Diff line number Diff line
@@ -26,3 +26,11 @@ 
		       <0x0001001b 0x0002001a 0x0 0x0>,

		       <0x0001001b 0x0202001a 0x0 0x0>;

};



&dsi_dual_nt35597_truly_video_display {

	/delete-property/ qcom,dsi-display-active;

};



&dsi_rm67195_amoled_fhd_cmd_display {

	qcom,dsi-display-active;

};

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

+6 −4
Original line number Diff line number Diff line
@@ -109,9 +109,9 @@ 


		qcom,panel-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "wqhd-vddio";

			qcom,supply-name = "vddio";

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

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

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

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

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

		};
@@ -421,8 +421,10 @@ 


		qcom,dsi-panel = <&dsi_rm67195_amoled_fhd_cmd>;

		vddio-supply = <&pm660_l11>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;

		vdda-3p3-supply = <&pm660l_l6>;

		lab-supply = <&lab_regulator>;

		ibb-supply = <&ibb_regulator>;

		oledb-supply = <&pm660a_oledb>;

	};



	dsi_nt35695b_truly_fhd_video_display: qcom,dsi-display@13 {