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

Commit 59c5c801 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: specify IBB discharge resistor configuration for MSM8952"

parents 5a288ce5 32d466da

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

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

};



&ibb_regulator {

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

};



/* CoreSight */

&tpiu {

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

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

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

};



&ibb_regulator {

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

};



/* CoreSight */

&tpiu {

	pinctrl-names = "sdcard", "trace", "swduart",