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

Commit c43338d3 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: correct external sense definition for 8994 MTP and Fluid"

parents 672c84a7 e365ac3a

arch/arm/boot/dts/qcom/msm8994-fluid.dtsi

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


&pmi8994_fg {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,ext-sense-type;

};



&pmi8994_haptics {
@@ -754,6 +755,5 @@ 
};



&pmi8994_charger {

	qcom,ext-sense-type;

	qcom,dc-psy-type = "Wipower";

};

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

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


&pmi8994_fg {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,ext-sense-type;

};



&pmi8994_haptics {
@@ -756,7 +757,6 @@ 
};



&pmi8994_charger {

	qcom,ext-sense-type;

	qcom,dc-psy-type = "Wipower";

	qcom,dcin-vadc = <&pmi8994_vadc>;

	qcom,wipower-default-ilim-map = <4000000 20000000 550 700 300>;