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

Commit 1275c622 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: Move battery data node to the soc DT file for qm215"

parents 83266333 c282779e
Loading
Loading
Loading
Loading
+0 −9
Original line number Original line Diff line number Diff line
@@ -48,15 +48,6 @@
	};
	};
};
};


/ {
	qrd_batterydata: qcom,batterydata {
		qcom,rpull-up-kohm = <100>;
		qcom,vref-batt-therm = <1800000>;

		#include "vbms-batterydata-mlp356477-2800mah.dtsi"
	};
};

&sdhc_1 {
&sdhc_1 {
	/* device core power supply */
	/* device core power supply */
	vdd-supply = <&pm8916_l8>;
	vdd-supply = <&pm8916_l8>;
+9 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,15 @@
	qcom,msm-name = "QM215";
	qcom,msm-name = "QM215";
};
};


/ {
	qrd_batterydata: qcom,batterydata {
		qcom,rpull-up-kohm = <100>;
		qcom,vref-batt-therm = <1800000>;

		#include "vbms-batterydata-mlp356477-2800mah.dtsi"
	};
};

&soc {
&soc {
	/delete-node/ devfreq-cpufreq;
	/delete-node/ devfreq-cpufreq;
	devfreq-cpufreq {
	devfreq-cpufreq {