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

Commit 33fffaf7 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 power supplies for amoled panel on sdm660"

parents e106ce90 f36d9e90

arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi

+51 −2
Original line number Diff line number Diff line
@@ -56,9 +56,58 @@ 
			qcom,supply-post-on-sleep = <10>;

		};

	};



	dsi_panel_pwr_supply_labibb_amoled:

		dsi_panel_pwr_supply_labibb_amoled {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,panel-supply-entry@0 {

				reg = <0>;

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

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

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

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

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

			};



			qcom,panel-supply-entry@1 {

				reg = <1>;

				qcom,supply-name = "vdda-3p3";

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

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

				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>;

			};

		};



&soc {

	dsi_panel_pwr_supply_no_labibb: dsi_panel_pwr_supply_no_labibb {

		#address-cells = <1>;

		#size-cells = <0>;

arch/arm/boot/dts/qcom/sdm660-mdss.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -355,6 +355,7 @@ 


			qcom,timing-db-mode;

			wqhd-vddio-supply = <&pm660_l11>;

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

			lab-supply = <&lcdb_ldo_vreg>;

			ibb-supply = <&lcdb_ncp_vreg>;

			qcom,mdss-mdp = <&mdss_mdp>;

arch/arm/boot/dts/qcom/sdm660-pm660a-cdp.dts

+12 −0
Original line number Diff line number Diff line
@@ -24,3 +24,15 @@ 
	qcom,board-id = <1 0>;

	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

};



&mdss_dsi0 {

	oledb-supply = <&pm660a_oledb>;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};



&mdss_dsi1 {

	oledb-supply = <&pm660a_oledb>;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};

arch/arm/boot/dts/qcom/sdm660-pm660a-mtp.dts

+12 −0
Original line number Diff line number Diff line
@@ -24,3 +24,15 @@ 
	qcom,board-id = <8 0>;

	qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>;

};



&mdss_dsi0 {

	oledb-supply = <&pm660a_oledb>;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};



&mdss_dsi1 {

	oledb-supply = <&pm660a_oledb>;

	lab-supply = <&lab_regulator>;

	ibb-supply = <&ibb_regulator>;

};