diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2017-09-01 16:48:46 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-09-02 13:01:52 -0700 |
| commit | 902706a2ebc1c51767b882279f558dd2c799e601 (patch) | |
| tree | 61f4de12e20ad7413c24250958c877e45241f50a /driver | |
| parent | 686e0d05adc778e0335fe5b5ec8e5673293b2b5d (diff) | |
| download | chrome-ec-902706a2ebc1c51767b882279f558dd2c799e601.tar.gz | |
cleanup: Remove duplicate BD9995X CONFIGs
BUG=chromium:700933
BRANCH=None
TEST=`make buildall -j`
Change-Id: Id76fe93612fcd1ef924d7fa94479c45a52db046b
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/648566
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/build.mk | 3 | ||||
| -rw-r--r-- | driver/charger/bd9995x.c | 3 | ||||
| -rw-r--r-- | driver/charger/bd9995x.h | 10 |
3 files changed, 6 insertions, 10 deletions
diff --git a/driver/build.mk b/driver/build.mk index 82a8f7a41d..932d7f9888 100644 --- a/driver/build.mk +++ b/driver/build.mk @@ -40,8 +40,7 @@ driver-$(CONFIG_BATTERY_MAX17055)+=battery/max17055.o driver-$(CONFIG_BATTERY_SMART)+=battery/smart.o # Battery charger ICs -driver-$(CONFIG_CHARGER_BD99955)+=charger/bd9995x.o -driver-$(CONFIG_CHARGER_BD99956)+=charger/bd9995x.o +driver-$(CONFIG_CHARGER_BD9995X)+=charger/bd9995x.o driver-$(CONFIG_CHARGER_BQ24192)+=charger/bq24192.o driver-$(CONFIG_CHARGER_BQ24707A)+=charger/bq24707a.o driver-$(CONFIG_CHARGER_BQ24715)+=charger/bq24715.o diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index 9105a0636d..82bbd675fd 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -1470,10 +1470,11 @@ static int bd9995x_i2c_write(const int reg, int data) return ch_raw_write16(reg, data, BD9995X_EXTENDED_COMMAND); } +/* BD9995X_CMD_CHIP_ID register value may vary by chip. */ struct i2c_stress_test_dev bd9995x_i2c_stress_test_dev = { .reg_info = { .read_reg = BD9995X_CMD_CHIP_ID, - .read_val = BD9995X_CHIP_ID, + .read_val = BD99956_CHIP_ID, .write_reg = BD9995X_CMD_ITRICH_SET, }, .i2c_read_dev = &bd9995x_i2c_read, diff --git a/driver/charger/bd9995x.h b/driver/charger/bd9995x.h index 892e76cf10..7bbe7cad26 100644 --- a/driver/charger/bd9995x.h +++ b/driver/charger/bd9995x.h @@ -11,13 +11,9 @@ #define BD9995X_ADDR 0x12 /* 7bit address 0001_001 */ #define I2C_ADDR_CHARGER BD9995X_ADDR -#ifdef CONFIG_CHARGER_BD99955 -#define BD9995X_CHARGER_NAME "bd99955" -#define BD9995X_CHIP_ID 0x221 -#elif defined(CONFIG_CHARGER_BD99956) -#define BD9995X_CHARGER_NAME "bd99956" -#define BD9995X_CHIP_ID 0x331 -#endif +#define BD9995X_CHARGER_NAME "bd9995x" +#define BD99955_CHIP_ID 0x221 +#define BD99956_CHIP_ID 0x331 /* BD9995X commands to change the command code map */ enum bd9995x_command { |