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

Commit 077d77bd authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy Committed by Ashay Jaiswal
Browse files

power: smb1351-charger: stay awake during i2c transactions 



I2C transactions can timeout if the bus is already suspended
when the I2C transaction is initiated. Prevent this by holding
the device wake during I2C transactions.

Note that if the transaction is initiated after suspend_noirq,
the transaction will still timeout, but the I2C retry will
ensure the transaction goes through.

Change-Id: Ic9ff3f5372ff774715256ea3cc6da7496c75031f
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent deaa86bd

drivers/power/smb1351-charger.c

+7 −0
Original line number Diff line number Diff line
@@ -541,13 +541,16 @@ static int smb1351_read_reg(struct smb1351_charger *chip, int reg, u8 *val) 
{

	s32 ret;



	pm_stay_awake(chip->dev);

	ret = i2c_smbus_read_byte_data(chip->client, reg);

	if (ret < 0) {

		pr_err("i2c read fail: can't read from %02x: %d\n", reg, ret);

		pm_relax(chip->dev);

		return ret;

	} else {

		*val = ret;

	}

	pm_relax(chip->dev);

	pr_debug("Reading 0x%02x=0x%02x\n", reg, *val);

	return 0;

}
@@ -556,12 +559,15 @@ static int smb1351_write_reg(struct smb1351_charger *chip, int reg, u8 val) 
{

	s32 ret;



	pm_stay_awake(chip->dev);

	ret = i2c_smbus_write_byte_data(chip->client, reg, val);

	if (ret < 0) {

		pr_err("i2c write fail: can't write %02x to %02x: %d\n",

			val, reg, ret);

		pm_relax(chip->dev);

		return ret;

	}

	pm_relax(chip->dev);

	pr_debug("Writing 0x%02x=0x%02x\n", reg, val);

	return 0;

}
@@ -2791,6 +2797,7 @@ static int smb1351_main_charger_probe(struct i2c_client *client, 
	chip->usb_psy = usb_psy;

	chip->fake_battery_soc = -EINVAL;

	INIT_DELAYED_WORK(&chip->chg_remove_work, smb1351_chg_remove_work);

	device_init_wakeup(chip->dev, true);



	/* probe the device to check if its actually connected */

	rc = smb1351_read_reg(chip, CHG_REVISION_REG, &reg);