evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mfd: qcom-i2c-pmic: Add retry mechanism for slow slave responding"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-19 19:10:28 -08:00 • committed by Gerrit - the friendly Code Review server
commit c771f8342e
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/mfd/qcom-i2c-pmic.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2016 The Linux Foundation. All rights reserved. /* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License version 2 and
@ -467,12 +467,29 @@ static int i2c_pmic_parse_dt(struct i2c_pmic *chip)
return rc; return rc;
} }
#define MAX_I2C_RETRIES 3
static int i2c_pmic_read(struct regmap *map, unsigned int reg, void *val,
size_t val_count)
{
int rc, retries = 0;
do {
rc = regmap_bulk_read(map, reg, val, val_count);
} while (rc == -ENOTCONN && retries++ < MAX_I2C_RETRIES);
if (retries > 1)
pr_err("i2c_pmic_read failed for %d retries, rc = %d\n",
retries - 1, rc);
return rc;
}
static int i2c_pmic_determine_initial_status(struct i2c_pmic *chip) static int i2c_pmic_determine_initial_status(struct i2c_pmic *chip)
{ {
int rc, i; int rc, i;
for (i = 0; i < chip->num_periphs; i++) { for (i = 0; i < chip->num_periphs; i++) {
rc = regmap_bulk_read(chip->regmap, rc = i2c_pmic_read(chip->regmap,
chip->periph[i].addr | INT_SET_TYPE_OFFSET, chip->periph[i].addr | INT_SET_TYPE_OFFSET,
chip->periph[i].cached, IRQ_MAX_REGS); chip->periph[i].cached, IRQ_MAX_REGS);
if (rc < 0) { if (rc < 0) {