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

Commit 9dbf5a28 authored by Eric Bénard's avatar Eric Bénard Committed by Sebastian Reichel
Browse files

bq27x00_battery: fix register offset for bq27425 



- SOC is at 0x1C so we must add 0x4 as stated in the comment to read the
  right value.
- DCAP is at 0x3c so we also must use a value with the right offset to get
  the correct design capacity.

Actually testing on a bq27410 which has the same register map as bq27425
(but adds new registers).

Signed-off-by: default avatarEric Bénard <eric@eukrea.com>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 19fb8b2d

drivers/power/bq27x00_battery.c

+8 −4
Original line number Diff line number Diff line
@@ -76,7 +76,8 @@ 


/* bq27425 register addresses are same as bq27x00 addresses minus 4 */

#define BQ27425_REG_OFFSET		0x04

#define BQ27425_REG_SOC			0x18 /* Register address plus offset */

#define BQ27425_REG_SOC		(0x1C + BQ27425_REG_OFFSET)

#define BQ27425_REG_DCAP		(0x3C + BQ27425_REG_OFFSET)



#define BQ27000_RS			20 /* Resistor sense */

#define BQ27x00_POWER_CONSTANT		(256 * 29200 / 1000)
@@ -282,9 +283,12 @@ static int bq27x00_battery_read_ilmd(struct bq27x00_device_info *di) 
{

	int ilmd;



	if (bq27xxx_is_chip_version_higher(di))

		ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);

	if (bq27xxx_is_chip_version_higher(di)) {

		if (di->chip == BQ27425)

			ilmd = bq27x00_read(di, BQ27425_REG_DCAP, false);

		else

			ilmd = bq27x00_read(di, BQ27500_REG_DCAP, false);

	} else

		ilmd = bq27x00_read(di, BQ27000_REG_ILMD, true);



	if (ilmd < 0) {