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

Commit ffee0e53 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Modify JEITA specs of qg-ascent-3450mAh battery"

parents 23d05391 28c2d618

Documentation/devicetree/bindings/power/supply/qcom/smb1355-charger.txt

+12 −0
Original line number Diff line number Diff line
@@ -63,6 +63,18 @@ Charger specific properties: 
  Value type: bool

  Definition: Boolean property to enable h/w controlled die temp mitigation.



- pinctrl-names

  Usage:      optional

  Value type: <string-list>

  Definition: Should be "default".

		Please refer to pinctrl-bindings.txt



- pinctrl-0

  Usage:      optional

  Value type: <phandle-list>

  Definition: phandle of the pin configuration.

		Please refer to pinctrl-bindings.txt



================================================

Second Level Nodes - SMB1355 Charger Peripherals

================================================

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

+1 −16
Original line number Diff line number Diff line 
/* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2017-2019, 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
@@ -194,8 +194,6 @@ 
			#cooling-cells = <2>;



			qcom,pmic-revid = <&pmi632_revid>;

			/* TODO Add dpdm supply once USB node is added */

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

			io-channels = <&pmi632_vadc ADC_USB_IN_V_16>,

				      <&pmi632_vadc ADC_USB_IN_I>,

				      <&pmi632_vadc ADC_CHG_TEMP>,
@@ -204,16 +202,6 @@ 
					   "usb_in_current",

					   "chg_temp",

					   "die_temp";

			qcom,flash-disable-soc = <10>;

			qcom,sw-jeita-enable;

			qcom,step-charging-enable;

			qcom,hw-die-temp-mitigation;

			qcom,hw-connector-mitigation;

			qcom,connector-internal-pull-kohm = <100>;



			qcom,thermal-mitigation

				= <3000000 2500000 2000000 1500000

					1000000 500000>;



			qcom,chgr@1000 {

				reg = <0x1000 0x100>;
@@ -367,9 +355,6 @@ 
			#address-cells = <1>;

			#size-cells = <1>;



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

			qcom,hold-soc-while-full;

			qcom,linearize-soc;

			qcom,pmic-revid = <&pmi632_revid>;

			io-channels = <&pmi632_vadc ADC_BAT_THERM_PU2>,

				      <&pmi632_vadc ADC_BAT_ID_PU2>;

arch/arm64/boot/dts/qcom/qg-batterydata-ascent-3450mah.dtsi

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



qcom,ascent_3450mah {
@@ -33,7 +33,7 @@ qcom,ascent_3450mah { 


	/* COOL hys = 8 DegC, WARM hys = 37 DegC */

	qcom,jeita-soft-hys-thresholds = <0x4f5e 0x2943>;

	qcom,jeita-soft-fcc-ua = <2500000 2500000>;

	qcom,jeita-soft-fcc-ua = <1725000 2760000>;

	qcom,jeita-soft-fv-uv = <4250000 4250000>;



	qcom,fcc1-temp-lut {

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

+79 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 


#include "trinket-thermal-overlay.dtsi"



&qupv3_se1_i2c {

	status = "ok";

	#include "smb1355.dtsi"

};



&soc {

	mtp_batterydata: qcom,battery-data {

		qcom,batt-id-range-pct = <15>;
@@ -62,16 +67,90 @@ 


&pmi632_qg {

	qcom,battery-data = <&mtp_batterydata>;

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

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

};



&pmi632_charger {

	qcom,battery-data = <&mtp_batterydata>;

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

	qcom,sw-jeita-enable;

	qcom,step-charging-enable;

	/* SMB1355 only */

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

	dpdm-supply = <&qusb_phy0>;

	qcom,charger-temp-max = <800>;

	qcom,smb-temp-max = <800>;

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

	qcom,flash-disable-soc = <10>;

	qcom,hw-die-temp-mitigation;

	qcom,hw-connector-mitigation;

	qcom,connector-internal-pull-kohm = <100>;

	qcom,thermal-mitigation = <3000000 2500000

			2000000 1500000 1000000 500000>;

};



&usb0 {

	extcon = <&pmi632_charger>;

};



&pmi632_gpios {

	smb_en {

		smb_en_default: smb_en_default {

			pins = "gpio2";

			function = "func1";

			output-enable;

		};

	};



	pmi632_sense {

		/* GPIO 7 and 8 are external-sense pins for PMI632 */

		pmi632_sense_default: pmi632_sense_default {

			pins = "gpio7", "gpio8";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};



	pmi632_ctm {

		/* Disable GPIO1 for h/w base mitigation */

		pmi632_ctm_default: pmi632_ctm_default {

			pins = "gpio1";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {

	smb_int_default: smb_int_default {

		mux {

			pins = "gpio130";

			function = "gpio";

		};

		config {

			pins = "gpio130";

			drive-strength = <2>;

			bias-pull-up;

			input-enable;

		};

	};

};



&smb1355 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <130 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

};



&smb1355_charger {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	qcom,parallel-mode = <1>;

	qcom,disable-ctm;

	qcom,hw-die-temp-mitigation;

	status = "ok";

};

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

+94 −0
Original line number Diff line number Diff line
@@ -12,8 +12,42 @@ 
 */

#include <dt-bindings/gpio/gpio.h>



&qupv3_se1_i2c {

	status = "ok";

	#include "smb1355.dtsi"

};



&soc {

	mtp_batterydata: qcom,battery-data {

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

		#include "qg-batterydata-ascent-3450mah.dtsi"

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

	};

};



&pmi632_qg {

	qcom,battery-data = <&mtp_batterydata>;

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

	qcom,hold-soc-while-full;

	qcom,linearize-soc;

};



&pmi632_charger {

	qcom,battery-data = <&mtp_batterydata>;

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

	qcom,sw-jeita-enable;

	/* SMB1355 only */

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

	dpdm-supply = <&qusb_phy0>;

	qcom,charger-temp-max = <800>;

	qcom,smb-temp-max = <800>;

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

	qcom,flash-disable-soc = <10>;

	qcom,hw-die-temp-mitigation;

	qcom,hw-connector-mitigation;

	qcom,connector-internal-pull-kohm = <100>;

	qcom,thermal-mitigation = <3000000 2500000

			2000000 1500000 1000000 500000>;

};



&sdhc_1 {
@@ -53,3 +87,63 @@ 


	status = "ok";

};



&pmi632_gpios {

	smb_en {

		smb_en_default: smb_en_default {

			pins = "gpio2";

			function = "func1";

			output-enable;

		};

	};



	pmi632_sense {

		/* GPIO 7 and 8 are external-sense pins for PMI632 */

		pmi632_sense_default: pmi632_sense_default {

			pins = "gpio7", "gpio8";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};



	pmi632_ctm {

		/* Disable GPIO1 for h/w base mitigation */

		pmi632_ctm_default: pmi632_ctm_default {

			pins = "gpio1";

			bias-high-impedance;	/* disable the GPIO */

			bias-disable;		/* no-pull */

		};

	};

};



&tlmm {

	smb_int_default: smb_int_default {

		mux {

			pins = "gpio130";

			function = "gpio";

		};

		config {

			pins = "gpio130";

			drive-strength = <2>;

			bias-pull-up;

			input-enable;

		};

	};

};



&smb1355 {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_int_default>;

	interrupt-parent = <&tlmm>;

	interrupts = <130 IRQ_TYPE_LEVEL_LOW>;

	status = "ok";

};



&smb1355_charger {

	pinctrl-names = "default";

	pinctrl-0 = <&smb_en_default &pmi632_sense_default &pmi632_ctm_default>;

	qcom,parallel-mode = <1>;

	qcom,disable-ctm;

	qcom,hw-die-temp-mitigation;

	status = "ok";

};