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

Commit 665839da authored by Umang Agrawal's avatar Umang Agrawal
Browse files

ARM: dts: msm: Add configurability support to pm6150 charger/qg 



Currently, pm6150 charger and qgauge optional configurations are
defined within primary dt file which prevent its configurations
from being over written from the device specific overlay files
like sm6150 qrd or idp dtsi files.

Fix this by migrating configurable parameters to device specific
overlay files for sm6150 and sdmmagpie target.

Change-Id: I002f060fba120213928af9ae490a9e9494bb7e68
Signed-off-by: default avatarUmang Agrawal <uagrawal@codeaurora.org>
parent 3f815bfe

arch/arm64/boot/dts/qcom/pm6150.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -207,10 +207,6 @@ 
			#cooling-cells = <2>;



			qcom,pmic-revid = <&pm6150_revid>;

			qcom,auto-recharge-soc = <98>;



			qcom,thermal-mitigation = <4200000 3500000 3000000

					2500000 2000000 1500000 1000000 500000>;



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;
@@ -411,10 +407,6 @@ 
			qcom,vbatt-empty-mv = <3000>;

			qcom,vbatt-empty-cold-mv = <3000>;

			qcom,s3-entry-fifo-length = <2>;

			qcom,qg-iterm-ma = <100>;

			qcom,hold-soc-while-full;

			qcom,linearize-soc;

			qcom,cl-feedback-on;



			qcom,pmic-revid = <&pm6150_revid>;

			io-channels = <&pm6150_vadc ADC_BAT_THERM_PU2>,

arch/arm64/boot/dts/qcom/sdmmagpie-idp.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 
#include "sdmmagpie-camera-sensor-idp.dtsi"



&soc {

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "qg-batterydata-alium-3600mah.dtsi"

		#include "qg-batterydata-mlp466076-3200mah.dtsi"

	};

};



&qupv3_se8_2uart {
@@ -221,6 +226,10 @@ 


&pm6150_qg {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,qg-iterm-ma = <100>;

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

	qcom,cl-feedback-on;

};



&pm6150_charger {
@@ -235,10 +244,15 @@ 
			   "die_temp",

			   "conn_temp";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,auto-recharge-soc = <98>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

	qcom,fcc-stepping-enable;

	qcom,suspend-input-on-debug-batt;

	qcom,sec-charger-config = <3>;

	qcom,thermal-mitigation = <4200000 3500000 3000000

			2500000 2000000 1500000 1000000 500000>;

	dpdm-supply = <&qusb_phy0>;

};



&pm6150_gpios {

arch/arm64/boot/dts/qcom/sdmmagpie-qrd.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ 
		pinctrl-1 = <&fpc_reset_high>;

		pinctrl-2 = <&fpc_int_low>;

	};



	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "qg-batterydata-alium-3600mah.dtsi"

		#include "qg-batterydata-mlp466076-3200mah.dtsi"

	};

};



&qupv3_se7_i2c{
@@ -262,6 +268,10 @@ 


&pm6150_qg {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,qg-iterm-ma = <100>;

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

	qcom,cl-feedback-on;

};



&pm6150_charger {
@@ -276,9 +286,14 @@ 
			   "die_temp",

			   "conn_temp";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,auto-recharge-soc = <98>;

	qcom,sw-jeita-enable;

	qcom,fcc-stepping-enable;

	qcom,suspend-input-on-debug-batt;

	qcom,sec-charger-config = <1>;

	qcom,thermal-mitigation = <4200000 3500000 3000000

			2500000 2000000 1500000 1000000 500000>;

	dpdm-supply = <&qusb_phy0>;

};



&pm6150_gpios {

arch/arm64/boot/dts/qcom/sdmmagpie.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -656,12 +656,6 @@ 
			linux,cma-default;

		};

	};



	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "qg-batterydata-alium-3600mah.dtsi"

		#include "qg-batterydata-mlp466076-3200mah.dtsi"

	};

};



&soc {
@@ -3075,11 +3069,6 @@ 
	extcon = <&pm6150_pdphy>, <&pm6150_charger>, <&eud>;

};



&pm6150_charger {

	dpdm-supply = <&qusb_phy0>;

	qcom,suspend-input-on-debug-batt;

};



&pm6150_vadc {

	rf_pa0_therm {

		reg = <ADC_AMUX_THM2_PU2>;

arch/arm64/boot/dts/qcom/sm6150-idp.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -53,6 +53,12 @@ 
			gpio-key,wakeup;

		};

	};



	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;

		#include "qg-batterydata-alium-3600mah.dtsi"

		#include "qg-batterydata-mlp356477-2800mah.dtsi"

	};

};



&qupv3_se0_2uart {
@@ -182,6 +188,10 @@ 


&pm6150_qg {

	qcom,battery-data = <&mtp_batterydata>;

	qcom,qg-iterm-ma = <100>;

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

	qcom,cl-feedback-on;

};



&pm6150_charger {
@@ -200,10 +210,15 @@ 
			   "sbux_res",

			   "vph_voltage";

	qcom,battery-data = <&mtp_batterydata>;

	qcom,auto-recharge-soc = <98>;

	qcom,step-charging-enable;

	qcom,sw-jeita-enable;

	qcom,fcc-stepping-enable;

	qcom,suspend-input-on-debug-batt;

	qcom,sec-charger-config = <3>;

	qcom,thermal-mitigation = <4200000 3500000 3000000

			2500000 2000000 1500000 1000000 500000>;

	dpdm-supply = <&qusb_phy0>;

};



&smb1390 {