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>

10 files changed, 15 insertions, 20 deletions

diff --git a/board/coral/board.h b/board/coral/board.h
index 6dccddb61b..06f8ccb164 100644
--- a/board/coral/board.h
+++ b/board/coral/board.h
@@ -49,7 +49,7 @@
 #define CONFIG_CHARGE_RAMP
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_BD99956
+#define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/eve/board.h b/board/eve/board.h
index 705b12efed..c8d85bd513 100644
--- a/board/eve/board.h
+++ b/board/eve/board.h
@@ -91,7 +91,7 @@
 #define CONFIG_CHARGE_RAMP
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_BD99956
+#define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/kevin/board.h b/board/kevin/board.h
index 34a0ab961c..d7aa8b08ce 100644
--- a/board/kevin/board.h
+++ b/board/kevin/board.h
@@ -65,7 +65,7 @@
 #define CONFIG_VBOOT_HASH
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_BD99956
+#define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_INPUT_CURRENT 512
 #define CONFIG_CHARGER_MAINTAIN_VBAT
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
diff --git a/board/nefario/board.h b/board/nefario/board.h
index 9c34d3cfa6..bf2f6e1093 100644
--- a/board/nefario/board.h
+++ b/board/nefario/board.h
@@ -68,7 +68,7 @@
 #define CONFIG_VBOOT_HASH
 
 #define CONFIG_CHARGER
-#define CONFIG_CHARGER_BD99955
+#define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_INPUT_CURRENT 512
 #define CONFIG_CHARGER_MAINTAIN_VBAT
 #define CONFIG_CHARGER_V2
@@ -142,8 +142,8 @@
 #define CONFIG_CMD_CHARGER_PSYS
 
 /* Set PSYS gain for 50W max measurement */
-#define BD99955_PSYS_GAIN_SELECT \
-		BD99955_CMD_PMON_IOUT_CTRL_SET_PMON_GAIN_SET_08UAW
+#define BD9995X_PSYS_GAIN_SELECT \
+		BD9995X_CMD_PMON_IOUT_CTRL_SET_PMON_GAIN_SET_08UAW
 
 #define CONFIG_UART_HOST                0
 
diff --git a/board/reef/board.h b/board/reef/board.h
index 44b7e66e0c..7e33626307 100644
--- a/board/reef/board.h
+++ b/board/reef/board.h
@@ -49,7 +49,7 @@
 #define CONFIG_CHARGE_RAMP
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_BD99956
+#define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
diff --git a/board/reef_it8320/board.h b/board/reef_it8320/board.h
index 1f444d2c3e..c63f2b0ecf 100644
--- a/board/reef_it8320/board.h
+++ b/board/reef_it8320/board.h
@@ -39,7 +39,7 @@
 #define CONFIG_CHARGE_RAMP
 #define CONFIG_CHARGER
 #define CONFIG_CHARGER_V2
-#define CONFIG_CHARGER_BD99956
+#define CONFIG_CHARGER_BD9995X
 #define CONFIG_CHARGER_BD9995X_CHGEN
 #define CONFIG_CHARGER_DISCHARGE_ON_AC
 #define CONFIG_CHARGER_INPUT_CURRENT 512
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 {
diff --git a/include/config.h b/include/config.h
index 07e6e34149..c1fe44aa2d 100644
--- a/include/config.h
+++ b/include/config.h
@@ -447,8 +447,7 @@
 #undef CONFIG_CHARGER_V2
 
 /* Compile charger-specific code for these chargers (pick at most one) */
-#undef CONFIG_CHARGER_BD99955
-#undef CONFIG_CHARGER_BD99956
+#undef CONFIG_CHARGER_BD9995X
 #undef CONFIG_CHARGER_BQ24707A
 #undef CONFIG_CHARGER_BQ24715
 #undef CONFIG_CHARGER_BQ24725