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

Commit 995449d3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: Enable regulator drivers for msm8953"

parents 45e87993 d1f30c35
Loading
Loading
Loading
Loading
+60 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2015, 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,ascent-3450mah {
	/* #Ascent_860_82209_0000_3450mAh_averaged_MasterSlave_Sept28th2015*/
	qcom,max-voltage-uv = <4350000>;
	qcom,nom-batt-capacity-mah = <3450>;
	qcom,batt-id-kohm = <60>;
	qcom,battery-beta = <3435>;
	qcom,battery-type = "ascent_3450mah";
	qcom,chg-rslow-comp-c1 = <6834679>;
	qcom,chg-rslow-comp-c2 = <20647220>;
	qcom,chg-rs-to-rslow = <915002>;
	qcom,chg-rslow-comp-thr = <0xD5>;
	qcom,checksum = <0xE50C>;
	qcom,fg-profile-data = [
		 C5 83 25 77
		 AB 7B CA 74
		 4C 83 7F 5B
		 EB 80 ED 8C
		 EA 81 61 9B
		 A6 BE 2B D0
		 55 0E D6 83
		 09 77 25 7B
		 03 74 49 83
		 CC 70 0C 70
		 0C 85 67 82
		 E6 93 27 B5
		 61 C0 58 10
		 23 0D 50 59
		 CE 6E 71 FD
		 CD 15 CC 3F
		 1D 36 00 00
		 B9 47 29 3B
		 1D 2E 00 00
		 00 00 00 00
		 00 00 00 00
		 D8 6A E7 69
		 B3 7C 4E 7A
		 7E 77 77 70
		 40 77 0D 73
		 22 76 96 6A
		 71 65 20 B0
		 2C 97 63 12
		 64 A0 71 0C
		 28 00 FF 36
		 F0 11 30 03
		 00 00 00 0C
	];
};
+61 −0
Original line number Diff line number Diff line
/* Copyright (c) 2014-2015, 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,itech-3000mah {
	/* #Itech_B00826LF_3000mAh_Feb24th_Averaged*/
	qcom,max-voltage-uv = <4350000>;
	qcom,v-cutoff-uv = <3400000>;
	qcom,chg-term-ua = <100000>;
	qcom,batt-id-kohm = <100>;
	qcom,battery-type = "itech_3000mah";
	qcom,chg-rslow-comp-c1 = <4365000>;
	qcom,chg-rslow-comp-c2 = <8609000>;
	qcom,chg-rslow-comp-thr = <0xBE>;
	qcom,chg-rs-to-rslow = <761000>;
	qcom,fastchg-current-ma = <2000>;
	qcom,fg-cc-cv-threshold-mv = <4340>;
	qcom,checksum = <0x0B7C>;
	qcom,fg-profile-data = [
		F0 83 6B 7D
		66 81 EC 77
		43 83 E3 5A
		7C 81 33 8D
		E1 81 EC 98
		7B B5 F8 BB
		5B 12 E2 83
		4A 7C 63 80
		CF 75 50 83
		FD 5A 83 82
		E6 8E 12 82
		B6 9A 1A BE
		BE CB 55 0E
		96 0B E0 5A
		CE 6E 71 FD
		2A 31 7E 47
		CF 40 00 00
		DB 45 0F 32
		AF 31 00 00
		00 00 00 00
		00 00 00 00
		E3 6A 60 69
		9E 6D 47 83
		13 7C 23 70
		0B 74 8F 80
		DB 75 17 68
		BA 75 BF B3
		21 5B 69 B5
		6C A0 71 0C
		28 00 FF 36
		F0 11 30 03
		00 00 00 0E
	];
};
+62 −0
Original line number Diff line number Diff line
/* Copyright (c) 2015-2016, 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,qrd_msm8937_sku1_2920mah {
	/* #QRD8937_2800mAh_China_data_averaged_MasterSlave_Oct30th2015*/
	qcom,max-voltage-uv = <4400000>;
	qcom,nom-batt-capacity-mah = <2800>;
	qcom,batt-id-kohm = <90>;
	qcom,battery-beta = <3380>;
	qcom,battery-type = "qrd_msm8937_sku1_2800mah";
	qcom,fastchg-current-ma = <2600>;
	qcom,fg-cc-cv-threshold-mv = <4390>;
	qcom,chg-rslow-comp-c1 = <6733839>;
	qcom,chg-rslow-comp-c2 = <23336040>;
	qcom,chg-rs-to-rslow = <1049243>;
	qcom,chg-rslow-comp-thr = <0xDB>;
	qcom,checksum = <0x7E2A>;
	qcom,gui-version = "PMI8950GUI - 2.0.0.14";
	qcom,fg-profile-data = [
		C6 83 8A 77
		3E 80 84 75
		72 83 A1 7C
		A0 90 FC 97
		3F 82 09 99
		92 B7 97 C3
		4C 14 EB 83
		A7 7C CE 80
		79 76 60 83
		3B 64 34 88
		19 94 49 82
		07 9A 7F BD
		BF CA 53 0D
		32 0B 68 59
		14 70 71 FD
		8C 28 9C 45
		3F 21 00 00
		B6 47 FE 30
		0B 40 00 00
		00 00 00 00
		00 00 00 00
		3A 70 78 6B
		F7 77 7F 88
		32 7C F2 70
		64 75 0B 79
		2B 77 F3 6B
		CA 70 7D B1
		21 57 6B 6B
		6D A0 71 0C
		28 00 FF 36
		F0 11 30 03
		00 00 00 0C
	];
};
+20 −0
Original line number Diff line number Diff line
@@ -14,7 +14,9 @@
/dts-v1/;

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

/ {
	model = "Qualcomm Technologies, Inc. MSM8953 + PMI8950 MTP";
@@ -22,3 +24,21 @@
	qcom,board-id= <8 0>;
	qcom,pmic-id = <0x010016 0x010011 0x0 0x0>;
};

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

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

&pmi8950_charger {
	qcom,battery-data = <&mtp_batterydata>;
	qcom,chg-led-sw-controls;
	qcom,chg-led-support;
};
+28 −0
Original line number Diff line number Diff line
/*
 * Copyright (c) 2017, 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.
 */

&soc {
	led_flash0: qcom,camera-flash {
		cell-index = <0>;
		compatible = "qcom,camera-flash";
		qcom,flash-type = <1>;
		qcom,flash-source = <&pmi8950_flash0 &pmi8950_flash1>;
		qcom,torch-source = <&pmi8950_torch0 &pmi8950_torch1>;
		qcom,switch-source = <&pmi8950_switch>;
	};
};

&labibb {
	status = "ok";
	qpnp,qpnp-labibb-mode = "lcd";
};
Loading