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

Commit 7f30e8ad 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: set ibb discharge resistor to 300k for PMI8996"

parents ec0deec9 00fc0db0

arch/arm/boot/dts/qcom/apq8096-dragonboard.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -359,10 +359,6 @@ 
	qpnp,qpnp-labibb-mode = "lcd";

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



&rpm_bus {

	rpm-regulator-bstb {

		status = "disabled";

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

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ 


				qcom,qpnp-ibb-soft-start = <1000>;



				qcom,qpnp-ibb-discharge-resistor = <300>;

				qcom,qpnp-ibb-discharge-resistor = <32>;

				qcom,qpnp-ibb-lab-pwrup-delay = <8000>;

				qcom,qpnp-ibb-lab-pwrdn-delay = <8000>;

				qcom,qpnp-ibb-en-discharge;

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

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ 


				qcom,qpnp-ibb-soft-start = <1000>;



				qcom,qpnp-ibb-discharge-resistor = <300>;

				qcom,qpnp-ibb-discharge-resistor = <32>;

				qcom,qpnp-ibb-lab-pwrup-delay = <8000>;

				qcom,qpnp-ibb-lab-pwrdn-delay = <8000>;

				qcom,qpnp-ibb-en-discharge;

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

+4 −0
Original line number Diff line number Diff line
@@ -22,3 +22,7 @@ 
&pmi8994_charger {

	qcom,charging-disabled;

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <300>;

};

arch/arm/boot/dts/qcom/msm8952-cdp.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -482,10 +482,6 @@ 
	qpnp,qpnp-labibb-mode = "lcd";

};



&ibb_regulator {

	qcom,qpnp-ibb-discharge-resistor = <32>;

};



/* CoreSight */

&tpiu {

	pinctrl-names = "seta-pctrl", "setb-pctrl", "sdcard", "trace",