rubenslte/android_kernel_samsung_msm8226-rubenslte
1
Fork 0
forked from rubenslte/android_kernel_samsung_msm8226
Code Pull Requests Activity

fixup! s3ve3g: improved sec-battery compatibility with additional fixes

Browse Source 
* fix usage of logical AND operator

Change-Id: Idbceca2e123ac12af7f147094b072b5511524a48
This commit is contained in:
prototype74
2020-11-16 10:41:23 +01:00
committed by Francescodario Cuzzocrea
parent 93340a4ba8
commit d920af06c8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/power/qpnp-charger.c
+3 -3
View File
@@ -1639,7 +1639,7 @@ qpnp_chg_set_appropriate_vddmax(struct qpnp_chg_chip *chip)
chip->delta_vddmax_mv);
}
#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) || !defined(CONFIG_MACH_S3VE3G_EUR)
#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) && !defined(CONFIG_MACH_S3VE3G_EUR)
#define MIN_DELTA_MV_TO_INCREASE_VDD_MAX 8
#define MAX_DELTA_VDD_MAX_MV 80
#define VDD_MAX_CENTER_OFFSET 4
@@ -4669,7 +4669,7 @@ qpnp_chg_setup_flags(struct qpnp_chg_chip *chip)
return 0;
}
#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) || !defined(CONFIG_MACH_S3VE3G_EUR)
#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) && !defined(CONFIG_MACH_S3VE3G_EUR)
static void
sec_qpnp_chg_check_vddmax(struct qpnp_chg_chip *chip)
{
@@ -5612,7 +5612,7 @@ sec_qpnp_chg_get_property(struct power_supply *psy,
val->intval = POWER_SUPPLY_HEALTH_GOOD;
break;
case POWER_SUPPLY_PROP_CURRENT_MAX:
#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) || !defined(CONFIG_MACH_S3VE3G_EUR)
#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) && !defined(CONFIG_MACH_S3VE3G_EUR)
sec_qpnp_chg_check_vddmax(chip);
#endif
val->intval = charger->charging_current_max;