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

Commit 97fe84a8 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 battery profile data for msm8953/sdm450"

parents 8e7f4e56 766b0f3b
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@
/dts-v1/;

#include "apq8053.dtsi"
#include "pmi8950.dtsi"
#include "msm8953-pmi8950.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. APQ8053 + PMI8950 SOC";
+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@
	};
};

&pmi8950_fg {
&qpnp_fg {
	qcom,battery-data = <&mtp_batterydata>;
};

&pmi8950_charger {
&qpnp_smbcharger {
	qcom,battery-data = <&mtp_batterydata>;
	qcom,chg-led-sw-controls;
	qcom,chg-led-support;
+18 −0
Original line number Diff line number Diff line
@@ -20,3 +20,21 @@
	model = "MTP";
	qcom,board-id = <8 0>;
};

/{
	mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "batterydata-itech-3000mah.dtsi"
		#include "batterydata-ascent-3450mAh.dtsi"
	};
};

&qpnp_fg {
	qcom,battery-data = <&mtp_batterydata>;
};

&qpnp_smbcharger {
	qcom,battery-data = <&mtp_batterydata>;
	qcom,chg-led-sw-controls;
	qcom,chg-led-support;
};
+3 −7
Original line number Diff line number Diff line
/*
 * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 and
@@ -33,16 +33,12 @@
	};
};

&pmi8950_fg {
&qpnp_fg {
	qcom,battery-data = <&mtp_batterydata>;
};

&pmi8950_charger {
&qpnp_smbcharger {
	qcom,battery-data = <&mtp_batterydata>;
	qcom,chg-led-sw-controls;
	qcom,chg-led-support;
};

&usb3 {
	extcon = <&pmi8950_charger>;
};
+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@
/dts-v1/;

#include "msm8953.dtsi"
#include "pmi8937.dtsi"
#include "msm8953-pmi8937.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. MSM8953 + PMI8937 SOC";
Loading