Merge changes I48d6d53a,I6db6eb3a,I2662e176 into msm-4.14 (873ee8df) · Commits · e / devices / android_kernel_xiaomi_sm6125

arch/arm64/boot/dts/qcom/fg-gen4-batterydata-alium-3600mah.dtsi

0 → 100644

+133 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 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
		* only version 2 as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		qcom,alium_860_89032_0000_3600mah_averaged_masterslave_feb7th2018 {
		/* #Alium_860_89032_0000_3600mAh_averaged_MasterSlave_Feb7th2018*/
		qcom,max-voltage-uv = <4350000>;
		qcom,fastchg-current-ma = <3600>;
		qcom,batt-id-kohm = <107>;
		qcom,battery-beta = <4250>;
		qcom,therm-room-temp = <100000>;
		qcom,fg-cc-cv-threshold-mv = <4340>;
		qcom,battery-type = "alium_860_89032_0000_3600mah_feb7th2018";
		qcom,therm-coefficients = <0x2318 0xd0c 0xdaf7 0xc556 0x848d>;
		qcom,therm-center-offset = <0x70>;
		qcom,checksum = <0xB126>;
		qcom,gui-version = "PM855GUI - 0.0.0.26";
		qcom,fg-profile-data = [
		09 00 B5 EA
		40 CC 19 AA
		EA C2 00 00
		13 BC 83 8A
		03 80 D3 92
		AA 9D 47 80
		18 00 07 02
		58 13 47 FD
		A9 F2 CE 07
		00 00 A6 00
		36 F5 07 FD
		64 0D 0B 23
		34 2A BE 23
		B4 43 5C 4B
		40 00 3A 00
		3F 00 47 00
		3A 00 33 00
		36 00 37 00
		47 00 41 00
		40 00 40 00
		3B 00 30 00
		32 00 39 00
		32 00 42 00
		5C 64 47 00
		3B 08 40 10
		40 00 3A 00
		35 00 36 00
		3C 00 35 00
		44 20 53 40
		41 50 3B 13
		40 00 D8 00
		14 22 7E 0D
		21 02 AA 04
		ED 1C D4 09
		64 0C D3 23
		A4 18 D3 42
		B5 55 91 02
		90 12 2A 1F
		02 06 1F 0A
		A3 06 AE 1C
		8D 02 96 04
		D2 03 D1 17
		51 23 3F 45
		28 53 69 14
		93 20 8E EC
		18 D3 C8 CD
		DB 1C 7B C9
		7C 05 E6 BA
		B9 17 2C 93
		87 85 A2 92
		91 A8 09 80
		94 F2 E8 0C
		75 FB 97 EA
		00 F8 0E 04
		11 02 F4 F7
		75 0A 72 15
		49 11 15 10
		95 0B CE 03
		DD 05 59 03
		CE 07 32 00
		DF 02 CD 00
		A4 00 F5 02
		47 02 91 02
		CC 03 26 02
		3C 04 40 00
		37 00 3B 00
		3F 64 41 00
		41 10 41 18
		42 08 3E 00
		3F 00 40 08
		40 08 2B 00
		37 20 3C 40
		41 58 4A 10
		44 00 4B 00
		41 08 40 00
		40 00 40 00
		2B 08 38 08
		37 00 3E 20
		4A 40 54 58
		46 10 40 00
		40 08 40 10
		D8 00 8C 2A
		DB 04 28 02
		AD 04 0B 1D
		50 22 A7 45
		0D 52 A2 18
		74 03 AD 04
		35 02 AE 13
		3F 0A 5A 20
		DD 04 F1 02
		D8 05 C7 1C
		DD 02 3D 04
		EB 03 97 18
		52 03 D5 04
		19 02 72 00
		14 22 7E 05
		21 02 AA 04
		ED 1C D4 01
		64 04 D3 03
		A4 18 D3 02
		B5 05 91 02
		90 00 7C 01
		C0 00 FA 00
		04 0E 00 00
		];
		};

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

+73 −0

Original line number	Diff line number	Diff line
		@@ -328,6 +328,79 @@
		compatible = "qcom,msm-bcl-soc";
		#thermal-sensor-cells = <0>;
		};

		pm855b_fg: qpnp,fg {
		compatible = "qcom,fg-gen4";
		#address-cells = <1>;
		#size-cells = <1>;
		qcom,pmic-revid = <&pm855b_revid>;
		status = "okay";

		qcom,fg-batt-soc@4000 {
		status = "okay";
		reg = <0x4000 0x100>;
		interrupts = <0x2 0x40 0x0 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x40 0x1 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x40 0x2
		IRQ_TYPE_EDGE_RISING>,
		<0x2 0x40 0x3
		IRQ_TYPE_EDGE_RISING>,
		<0x2 0x40 0x4 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x40 0x5
		IRQ_TYPE_EDGE_RISING>,
		<0x2 0x40 0x6 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x40 0x7 IRQ_TYPE_EDGE_BOTH>;
		interrupt-names = "soc-update",
		"soc-ready",
		"bsoc-delta",
		"msoc-delta",
		"msoc-low",
		"msoc-empty",
		"msoc-high",
		"msoc-full";
		};

		qcom,fg-batt-info@4100 {
		status = "okay";
		reg = <0x4100 0x100>;
		interrupts = <0x2 0x41 0x0 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x41 0x1 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x41 0x3
		IRQ_TYPE_EDGE_RISING>;
		interrupt-names = "vbatt-low",
		"vbatt-pred-delta",
		"esr-delta";
		};

		qcom,fg-rradc@4200 {
		status = "okay";
		reg = <0x4200 0x100>;
		interrupts = <0x2 0x42 0x0 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x42 0x1 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x42 0x2 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x42 0x3 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x42 0x4 IRQ_TYPE_EDGE_BOTH>;
		interrupt-names = "batt-missing",
		"batt-id",
		"batt-temp-delta",
		"batt-temp-hot",
		"batt-temp-cold";
		};

		qcom,fg-memif@4300 {
		status = "okay";
		reg = <0x4300 0x100>;
		interrupts = <0x2 0x43 0x0 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x43 0x1 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x43 0x2 IRQ_TYPE_EDGE_BOTH>,
		<0x2 0x43 0x3
		IRQ_TYPE_EDGE_RISING>;
		interrupt-names = "ima-rdy",
		"ima-xcp",
		"dma-xcp",
		"dma-grant";
		};
		};
		};

		qcom,pm855b@3 {

arch/arm64/boot/dts/qcom/sdm855-mtp.dtsi

+9 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,11 @@
		qca,bt-vdd-pa-current-level = <0>; /* LPM/PFM */
		qca,bt-vdd-ldo-current-level = <0>; /* LPM/PFM */
		};

		mtp_batterydata: qcom,battery-data {
		qcom,batt-id-range-pct = <15>;
		#include "fg-gen4-batterydata-alium-3600mah.dtsi"
		};
		};

		&qupv3_se13_4uart {
		@@ -204,6 +209,10 @@
		status = "ok";
		};

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

		&sdhc_2 {
		vdd-supply = <&pm855l_l9>;
		qcom,vdd-voltage-level = <2950000 2960000>;