Merge "defconfig: spyro: Enable SMB2 and FG_GEN_3 support" (2c447af5) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/configs/spyro-perf_defconfig

+3 −19

Original line number	Diff line number	Diff line
		@@ -242,6 +242,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_HDCP_QSEECOM=y
		CONFIG_QSEECOM=y
		CONFIG_UID_SYS_STATS=y
		CONFIG_QPNP_MISC=y
		CONFIG_SCSI=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_MD=y
		@@ -336,14 +337,8 @@ CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_QPNP_FG=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_SMB1355_SLAVE_CHARGER=y
		CONFIG_SMB1351_USB_CHARGER=y
		CONFIG_QPNP_SMB5=y
		CONFIG_QPNP_SMBCHARGER=y
		CONFIG_QPNP_TYPEC=y
		CONFIG_QPNP_QG=y
		CONFIG_QPNP_FG_GEN3=y
		CONFIG_QPNP_SMB2=y
		CONFIG_MSM_APM=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_THERMAL=y
		@@ -360,7 +355,6 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y
		CONFIG_REGULATOR_COOLING_DEVICE=y
		CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		@@ -370,8 +364,6 @@ CONFIG_REGULATOR_CPR4_APSS=y
		CONFIG_REGULATOR_CPRH_KBSS=y
		CONFIG_REGULATOR_MEM_ACC=y
		CONFIG_REGULATOR_MSM_GFX_LDO=y
		CONFIG_REGULATOR_QPNP_LABIBB=y
		CONFIG_REGULATOR_QPNP_LCDB=y
		CONFIG_REGULATOR_QPNP=y
		CONFIG_REGULATOR_RPM_SMD=y
		CONFIG_REGULATOR_SPM=y
		@@ -483,13 +475,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_SDHCI_MSM=y
		CONFIG_MMC_SDHCI_MSM_ICE=y
		CONFIG_MMC_CQ_HCI=y
		CONFIG_LEDS_QTI_TRI_LED=y
		CONFIG_LEDS_QPNP=y
		CONFIG_LEDS_QPNP_FLASH=y
		CONFIG_LEDS_QPNP_FLASH_V2=y
		CONFIG_LEDS_QPNP_WLED=y
		CONFIG_LEDS_QPNP_HAPTICS=y
		CONFIG_LEDS_QPNP_VIBRATOR_LDO=y
		CONFIG_LEDS_TRIGGERS=y
		CONFIG_LEDS_TRIGGER_TIMER=y
		CONFIG_EDAC=y
		@@ -563,8 +549,6 @@ CONFIG_SPDM_SCM=y
		CONFIG_DEVFREQ_SPDM=y
		CONFIG_IIO=y
		CONFIG_PWM=y
		CONFIG_PWM_QPNP=y
		CONFIG_PWM_QTI_LPG=y
		CONFIG_QTI_MPM=y
		CONFIG_ANDROID=y
		CONFIG_ANDROID_BINDER_IPC=y

arch/arm/configs/spyro_defconfig

+3 −19

Original line number	Diff line number	Diff line
		@@ -249,6 +249,7 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_HDCP_QSEECOM=y
		CONFIG_QSEECOM=y
		CONFIG_UID_SYS_STATS=y
		CONFIG_QPNP_MISC=y
		CONFIG_SCSI=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_MD=y
		@@ -345,14 +346,8 @@ CONFIG_POWER_RESET_QCOM=y
		CONFIG_QCOM_DLOAD_MODE=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_QPNP_FG=y
		CONFIG_SMB135X_CHARGER=y
		CONFIG_SMB1355_SLAVE_CHARGER=y
		CONFIG_SMB1351_USB_CHARGER=y
		CONFIG_QPNP_SMB5=y
		CONFIG_QPNP_SMBCHARGER=y
		CONFIG_QPNP_TYPEC=y
		CONFIG_QPNP_QG=y
		CONFIG_QPNP_FG_GEN3=y
		CONFIG_QPNP_SMB2=y
		CONFIG_MSM_APM=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_THERMAL=y
		@@ -369,7 +364,6 @@ CONFIG_QTI_QMI_COOLING_DEVICE=y
		CONFIG_REGULATOR_COOLING_DEVICE=y
		CONFIG_QTI_BCL_PMIC5=y
		CONFIG_QTI_BCL_SOC_DRIVER=y
		CONFIG_MFD_I2C_PMIC=y
		CONFIG_MFD_SPMI_PMIC=y
		CONFIG_REGULATOR=y
		CONFIG_REGULATOR_FIXED_VOLTAGE=y
		@@ -379,8 +373,6 @@ CONFIG_REGULATOR_CPR4_APSS=y
		CONFIG_REGULATOR_CPRH_KBSS=y
		CONFIG_REGULATOR_MEM_ACC=y
		CONFIG_REGULATOR_MSM_GFX_LDO=y
		CONFIG_REGULATOR_QPNP_LABIBB=y
		CONFIG_REGULATOR_QPNP_LCDB=y
		CONFIG_REGULATOR_QPNP=y
		CONFIG_REGULATOR_RPM_SMD=y
		CONFIG_REGULATOR_SPM=y
		@@ -494,13 +486,7 @@ CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_SDHCI_MSM=y
		CONFIG_MMC_SDHCI_MSM_ICE=y
		CONFIG_MMC_CQ_HCI=y
		CONFIG_LEDS_QTI_TRI_LED=y
		CONFIG_LEDS_QPNP=y
		CONFIG_LEDS_QPNP_FLASH=y
		CONFIG_LEDS_QPNP_FLASH_V2=y
		CONFIG_LEDS_QPNP_WLED=y
		CONFIG_LEDS_QPNP_HAPTICS=y
		CONFIG_LEDS_QPNP_VIBRATOR_LDO=y
		CONFIG_LEDS_TRIGGERS=y
		CONFIG_LEDS_TRIGGER_TIMER=y
		CONFIG_EDAC=y
		@@ -582,8 +568,6 @@ CONFIG_SPDM_SCM=y
		CONFIG_DEVFREQ_SPDM=y
		CONFIG_IIO=y
		CONFIG_PWM=y
		CONFIG_PWM_QPNP=y
		CONFIG_PWM_QTI_LPG=y
		CONFIG_QCOM_SHOW_RESUME_IRQ=y
		CONFIG_QTI_MPM=y
		CONFIG_ANDROID=y

arch/arm64/boot/dts/qcom/fg-gen3-batterydata-I13Z5P-680mAh.dtsi

0 → 100644

+84 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 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
		* 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,3388014_i13z5p_680mah_averaged_masterslave_mar26th2018 {
		qcom, = <24>;
		/* #3388014_I13Z5P_680mAh_averaged_MasterSlave_Mar26th2018*/
		qcom,max-voltage-uv = <4400000>;
		qcom,fg-cc-cv-threshold-mv = <4390>;
		qcom,nom-batt-capacity-mah = <680>;
		qcom,batt-id-kohm = <200>;
		qcom,battery-beta = <3435>;
		qcom,battery-type =
		"3388014_i13z5p_680mah_averaged_masterslave_mar26th2018";
		qcom,checksum = <0x8C0B>;
		qcom,gui-version = "PM660GUI - 0.0.0.45";
		qcom,fg-profile-data = [
		5E 24 56 0C
		E9 12 B0 0D
		05 1D 59 01
		F8 05 8C 02
		24 1B CF 13
		D6 35 86 3B
		A2 00 00 00
		1A 00 00 00
		00 00 1F CD
		57 AD 6C CA
		47 00 08 00
		FD DA E6 ED
		09 EC 03 E2
		58 07 89 01
		21 14 BA 5A
		0A 06 09 20
		27 00 14 00
		55 20 C3 04
		3A 0B 7C 05
		01 1D 39 02
		41 0D 1A 0B
		89 18 A6 2B
		2E 54 B7 72
		75 00 00 00
		07 00 00 00
		00 00 9C CC
		DE C3 51 A4
		48 00 00 00
		77 EB E6 ED
		6F EC D3 D2
		FF 07 DF F3
		91 E3 56 1A
		99 33 CC FF
		07 10 00 00
		BB 02 66 46
		48 00 40 00
		D8 02 0A FA
		FF 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		00 00 00 00
		];
		};

arch/arm64/boot/dts/qcom/pm660-rpm-regulator.dtsi

+17 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-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
		@@ -11,6 +11,22 @@
		*/

		&rpm_bus {
		rpm-regulator-smpa1 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";
		qcom,resource-id = <1>;
		qcom,regulator-type = <1>;
		qcom,hpm-min-load = <100000>;
		status = "disabled";

		regulator-s2 {
		compatible = "qcom,rpm-smd-regulator";
		regulator-name = "pm660_s2";
		qcom,set = <3>;
		status = "disabled";
		};
		};

		rpm-regulator-smpa2 {
		compatible = "qcom,rpm-smd-regulator-resource";
		qcom,resource-name = "smpa";

arch/arm64/boot/dts/qcom/sdm429-qrd-spyro-evt.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		*/

		#include "sdm439-qrd.dtsi"
		#include "sdm429w-pm660.dtsi"

		&mdss_dsi0 {
		qcom,dsi-pref-prim-pan = <&dsi_hx8399c_hd_vid>;