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

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

Merge "defconfig: msm: Enable CPR and FG related configs for SDM660"

parents 15959010 f8a26e45

arch/arm64/configs/vendor/sdm660-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_QPNP_FG_GEN3=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB2=y

CONFIG_SMB138X_CHARGER=y
@@ -372,6 +373,8 @@ CONFIG_REGULATOR_PROXY_CONSUMER=y 
CONFIG_REGULATOR_QPNP_LABIBB=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_QPNP_OLEDB=y

CONFIG_REGULATOR_CPR4_MMSS_LDO=y

CONFIG_REGULATOR_CPRH_KBSS=y

CONFIG_REGULATOR_MEM_ACC=y

CONFIG_REGULATOR_RPM_SMD=y

CONFIG_REGULATOR_SPM=y

arch/arm64/configs/vendor/sdm660_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -356,6 +356,7 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_QCOM_DLOAD_MODE=y

CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_QPNP_FG_GEN3=y

CONFIG_SMB1351_USB_CHARGER=y

CONFIG_QPNP_SMB2=y

CONFIG_SMB138X_CHARGER=y
@@ -377,6 +378,8 @@ CONFIG_REGULATOR_PROXY_CONSUMER=y 
CONFIG_REGULATOR_QPNP_LABIBB=y

CONFIG_REGULATOR_QPNP_LCDB=y

CONFIG_REGULATOR_QPNP_OLEDB=y

CONFIG_REGULATOR_CPR4_MMSS_LDO=y

CONFIG_REGULATOR_CPRH_KBSS=y

CONFIG_REGULATOR_MEM_ACC=y

CONFIG_REGULATOR_RPM_SMD=y

CONFIG_REGULATOR_SPM=y

drivers/power/supply/qcom/qpnp-fg-gen3.c

+1 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2020, 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
@@ -2475,7 +2475,6 @@ static void fg_esr_sw_work(struct work_struct *work) 
static enum alarmtimer_restart

	fg_esr_sw_timer(struct alarm *alarm, ktime_t now)

{

	union power_supply_propval pval = {0, };

	struct fg_dev *fg = container_of(alarm,

			struct fg_dev, esr_sw_timer);

drivers/regulator/cpr3-util.c

+2 −4
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2020, 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
@@ -2296,9 +2296,7 @@ static bool _cpr3_adjust_target_quotients(struct cpr3_regulator *vreg, 
					prev_quot = vreg->corner[i].target_quot[j];

					vreg->corner[i].target_quot[j]

						+= quot_adjust;

					cpr3_debug(vreg, "adjusted corner %d

						RO%d target quot %s: %u -->

						%u (%d uV)\n",

					cpr3_debug(vreg, "adjusted corner %d RO%d target quot %s: %u --> %u (%d uV)\n",

						i, j, label, prev_quot,

						vreg->corner[i].target_quot[j],

						volt_adjust[i]);