scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-29 18:11:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

charger/rt946x: Clear irq flags correctly

Browse Source 
rt946x_block_read() is not implemented right.
It not only makes rt946x_init_irq() fail but also put
RT946x i2c module in an erroneous state temporarily.

BUG=b:72228350
BRANCH=none
TEST=manually on scarlet rev3:
1)Insert Plugable USB-C hub w/o AC
2)Run cutoff command on ec console
3)Hold Pwr button for a few seconds to wake up DUT
4)Repeat 2 - 3 for 10 times without seeing PD loops

Change-Id: I9304617f924e44288483afca5ab1b2923eb68ff0
Signed-off-by: Philip Chen <philipchen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/890027
Commit-Ready: Philip Chen <philipchen@chromium.org>
Tested-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Brian Norris <briannorris@chromium.org>
This commit is contained in:
Philip Chen
2018-01-26 18:35:10 -08:00
committed by chrome-bot
parent 3a95a68292
commit df229ee8e6
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
driver/charger/rt946x.c
View File

@@ -107,11 +107,6 @@ static int rt946x_write8(int reg, int val)
return i2c_write8(I2C_PORT_CHARGER, RT946X_ADDR, reg, val);
}
static int rt946x_block_read(int reg, uint8_t *val, int len)
{
return i2c_read_string(I2C_PORT_CHARGER, RT946X_ADDR, reg, val, len);
}
static int rt946x_block_write(int reg, const uint8_t *val, int len)
{
int rv;
@@ -313,17 +308,22 @@ static int rt946x_set_ircmp_res(unsigned int res)
static int rt946x_init_irq(void)
{
int rv = 0;
uint8_t dummy[RT946X_IRQ_COUNT] = {0};
int dummy;
int i;
/* Mask all interrupts */
rv = rt946x_block_write(RT946X_REG_CHGSTATCCTRL, rt946x_irq_maskall,
RT946X_IRQ_COUNT);
if (rv)
return rv;
/* Clear all interrupt flags */
rv = rt946x_block_read(RT946X_REG_CHGSTATC, dummy, RT946X_IRQ_COUNT);
if (rv)
return rv;
for (i = 0; i < RT946X_IRQ_COUNT; i++) {
rv = rt946x_read8(RT946X_REG_CHGSTATC + i, &dummy);
if (rv)
return rv;
}
/* Init interrupt */
return rt946x_block_write(RT946X_REG_CHGSTATCCTRL, rt946x_irqmask,
ARRAY_SIZE(rt946x_irqmask));