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

Commit 606a3e1d 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 the LCDB device node for PM2FALCON"

parents 4aa28af5 751178df

arch/arm/boot/dts/qcom/msm-pm2falcon.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -366,5 +366,26 @@ 
				qcom,default-led-trigger = "switch1_trigger";

			};

		};



		pm2falcon_lcdb: qpnp-lcdb@ec00 {

			compatible = "qcom,qpnp-lcdb-regulator";

			#address-cells = <1>;

			#size-cells = <1>;

			reg = <0xec00 0x100>;



			lcdb_ldo_vreg: ldo {

				label = "ldo";

				regulator-name = "lcdb_ldo";

				regulator-min-microvolt = <4000000>;

				regulator-max-microvolt = <6000000>;

			};



			lcdb_ncp_vreg: ncp {

				label = "ncp";

				regulator-name = "lcdb_ncp";

				regulator-min-microvolt = <4000000>;

				regulator-max-microvolt = <6000000>;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm-pm3falcon.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -14,3 +14,8 @@ 
&pm2falcon_wled {

	status = "disabled";

};



/* disable LCDB */

&pm2falcon_lcdb {

	status = "disabled";

};

arch/arm/boot/dts/qcom/msm8998-interposer-pmfalcon.dtsi

+0 −17
Original line number Diff line number Diff line
@@ -252,20 +252,3 @@ 
#include "msm-pmfalcon-rpm-regulator.dtsi"

#include "msm-pm2falcon-rpm-regulator.dtsi"

#include "msmfalcon-regulator.dtsi"
 


/* dummy LCDB regulator nodes */

&soc {

	lcdb_ldo_vreg: regulator-vdisp-vreg {

		compatible = "qcom,stub-regulator";

		regulator-name = "lcdb_ldo";

		regulator-min-microvolt = <4000000>;

		regulator-max-microvolt = <6000000>;

	};



	lcdb_ncp_vreg: regulator-vdisn-vreg {

		compatible = "qcom,stub-regulator";

		regulator-name = "lcdb_ncp";

		regulator-min-microvolt = <4000000>;

		regulator-max-microvolt = <6000000>;

	};

};