summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Brockus <dbrockus@chromium.org>2019-07-26 11:01:18 -0600
committerCommit Bot <commit-bot@chromium.org>2019-07-26 22:09:52 +0000
commit06f871f4f71af647954bfc8ef829237ccc6a79c9 (patch)
tree6c4ce64b7cc1d9297d7794effef244d2ad582c18
parent30ab5997d7aed6c71943c9779544792695f4608f (diff)
downloadchrome-ec-06f871f4f71af647954bfc8ef829237ccc6a79c9.tar.gz
Zork: Change charger to ISL9241
Found a couple of compile issues when I swapped over to the ISL9241 charger. So fixed those as I changed chargers. BUG=none BRANCH=none TEST=make buildall -j Change-Id: Ifcacca859eb86f22ea0619e05dcaa689c56b0d73 Signed-off-by: Denis Brockus <dbrockus@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1720859 Reviewed-by: Edward Hill <ecgh@chromium.org> Reviewed-by: Jack Rosenthal <jrosenth@chromium.org> Commit-Queue: Edward Hill <ecgh@chromium.org>
-rw-r--r--baseboard/zork/baseboard.h2
-rw-r--r--driver/charger/isl9241.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/baseboard/zork/baseboard.h b/baseboard/zork/baseboard.h
index bba818aabf..0f2cf3f3f8 100644
--- a/baseboard/zork/baseboard.h
+++ b/baseboard/zork/baseboard.h
@@ -71,7 +71,7 @@
* See also b/111214767
*/
#define CONFIG_CHARGER_INPUT_CURRENT 512
-#define CONFIG_CHARGER_ISL9238
+#define CONFIG_CHARGER_ISL9241
#define CONFIG_CHARGER_SENSE_RESISTOR 10
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 20
#define CONFIG_CHARGE_RAMP_HW
diff --git a/driver/charger/isl9241.c b/driver/charger/isl9241.c
index 41d649d1c3..4db66e0b52 100644
--- a/driver/charger/isl9241.c
+++ b/driver/charger/isl9241.c
@@ -60,12 +60,14 @@ static const struct charger_info isl9241_charger_info = {
static inline int isl9241_read(int offset, int *value)
{
- return i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER, offset, value);
+ return i2c_read16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS,
+ offset, value);
}
static inline int isl9241_write(int offset, int value)
{
- return i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER, offset, value);
+ return i2c_write16(I2C_PORT_CHARGER, I2C_ADDR_CHARGER_FLAGS,
+ offset, value);
}
/* chip specific interfaces */