summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaveh Jalali <caveh@chromium.org>2020-01-13 20:19:47 -0800
committerCommit Bot <commit-bot@chromium.org>2020-05-28 08:03:06 +0000
commit9fed1d3f20a8ef30bda6d9f03b9a2446a41f6258 (patch)
tree07377c0cd2783d3393422611e7dd165d92008d3c
parentd65001cc98ce00f20c052403e3becbfa07db36b8 (diff)
downloadchrome-ec-9fed1d3f20a8ef30bda6d9f03b9a2446a41f6258.tar.gz
syv682x: fix status register read
We were reading CONTROL_1_REG instead of STATUS_REG to check the VSAFE_0V status. This corrects the register being accessed. BRANCH=none BUG=none TEST=volteer boots without a battery Change-Id: I06d0fbc0b9313b809ed43be13138241beca395a5 Signed-off-by: Caveh Jalali <caveh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1999619 Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-by: Scott Collyer <scollyer@chromium.org> Commit-Queue: Scott Collyer <scollyer@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2214878 Tested-by: David Huang <david.huang@quanta.corp-partner.google.com> Commit-Queue: Marco Chen <marcochen@chromium.org> Reviewed-by: Marco Chen <marcochen@chromium.org>
-rw-r--r--driver/ppc/syv682x.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/driver/ppc/syv682x.c b/driver/ppc/syv682x.c
index c69c984e46..51db2725b1 100644
--- a/driver/ppc/syv682x.c
+++ b/driver/ppc/syv682x.c
@@ -302,11 +302,14 @@ static int syv682x_init(int port)
return rv;
/* Check if this if dead battery case */
- rv = read_reg(port, SYV682X_CONTROL_1_REG, &regval);
+ rv = read_reg(port, SYV682X_STATUS_REG, &regval);
if (rv)
return rv;
if (regval & SYV682X_STATUS_VSAFE_0V) {
/* Not dead battery case, so disable channel */
+ rv = read_reg(port, SYV682X_CONTROL_1_REG, &regval);
+ if (rv)
+ return rv;
regval |= SYV682X_CONTROL_1_PWR_ENB;
rv = write_reg(port, SYV682X_CONTROL_1_REG, regval);
if (rv)