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

Commit df05b123 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 power supplies AMOLED panel on SDM670"

parents eb34fab1 ea9cbe85

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

+32 −0
Original line number Diff line number Diff line
@@ -37,6 +37,38 @@ 
	/delete-property/ qcom,dsi-display-active;

};



&dsi_panel_pwr_supply_labibb_amoled {

	qcom,panel-supply-entry@2 {

		reg = <2>;

		qcom,supply-name = "lab";

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

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

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

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

	};



	qcom,panel-supply-entry@3 {

		reg = <3>;

		qcom,supply-name = "ibb";

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

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

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

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

	};



	qcom,panel-supply-entry@4 {

		reg = <4>;

		qcom,supply-name = "oledb";

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

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

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

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

	};

};



&dsi_rm67195_amoled_fhd_cmd_display {

	qcom,dsi-display-active;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

	oledb-supply = <&pm660a_oledb>;

};

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

+32 −0
Original line number Diff line number Diff line
@@ -31,6 +31,38 @@ 
	/delete-property/ qcom,dsi-display-active;

};



&dsi_panel_pwr_supply_labibb_amoled {

	qcom,panel-supply-entry@2 {

		reg = <2>;

		qcom,supply-name = "lab";

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

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

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

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

	};



	qcom,panel-supply-entry@3 {

		reg = <3>;

		qcom,supply-name = "ibb";

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

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

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

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

	};



	qcom,panel-supply-entry@4 {

		reg = <4>;

		qcom,supply-name = "oledb";

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

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

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

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

	};

};



&dsi_rm67195_amoled_fhd_cmd_display {

	qcom,dsi-display-active;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

	oledb-supply = <&pm660a_oledb>;

};

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

+0 −30
Original line number Diff line number Diff line
@@ -124,33 +124,6 @@ 
			qcom,supply-enable-load = <13200>;

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

		};



		qcom,panel-supply-entry@2 {

			reg = <2>;

			qcom,supply-name = "lab";

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

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

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

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

		};



		qcom,panel-supply-entry@3 {

			reg = <3>;

			qcom,supply-name = "ibb";

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

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

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

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

		};



		qcom,panel-supply-entry@4 {

			reg = <4>;

			qcom,supply-name = "oledb";

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

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

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

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

		};

	};



	dsi_dual_nt35597_truly_video_display: qcom,dsi-display@0 {
@@ -422,9 +395,6 @@ 
		qcom,dsi-panel = <&dsi_rm67195_amoled_fhd_cmd>;

		vddio-supply = <&pm660_l11>;

		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 {