summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorScott Collyer <scollyer@google.com>2018-09-27 12:56:07 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-10-02 05:19:05 -0700
commit3b7ac6bedfa39ee10e000c705a400e2ede8fa4e5 (patch)
tree52d26f25605bb13180c37543bf7267c20b0f5702 /board
parentb729f9f10151438a86779d6c939b86572c0c1cda (diff)
downloadchrome-ec-3b7ac6bedfa39ee10e000c705a400e2ede8fa4e5.tar.gz
bc12: rename bq24392 driver to max14637
The MAX14637 BC 1.2 USB charger detection chip is functionally similar to the bq24392 and can use the same driver. Rather than have 2 copies of the same driver, or a generic named driver than can be used for both chips, rename the existing bq24392 driver to max14637 as that's the BC 1.2 chip that our current designs are using. BUG=b:113267982 BRANCH=none TEST=make -j buildall Change-Id: I03cfb4918513d756c2a41341001a8162652a29b6 Signed-off-by: Scott Collyer <scollyer@google.com> Reviewed-on: https://chromium-review.googlesource.com/1250031 Commit-Ready: Scott Collyer <scollyer@chromium.org> Tested-by: Scott Collyer <scollyer@chromium.org> Reviewed-by: Edward Hill <ecgh@chromium.org> Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'board')
-rw-r--r--board/aleena/board.c1
-rw-r--r--board/ampton/board.c1
-rw-r--r--board/bip/board.c1
-rw-r--r--board/bobba/board.c1
-rw-r--r--board/careena/board.c1
-rw-r--r--board/fleex/board.c1
-rw-r--r--board/grunt/board.c1
-rw-r--r--board/liara/board.c1
-rw-r--r--board/meep/board.c1
-rw-r--r--board/yorp/board.c1
-rw-r--r--board/zoombini/board.c10
-rw-r--r--board/zoombini/board.h2
12 files changed, 6 insertions, 16 deletions
diff --git a/board/aleena/board.c b/board/aleena/board.c
index e2929e9ead..d84d3a5bb5 100644
--- a/board/aleena/board.c
+++ b/board/aleena/board.c
@@ -17,7 +17,6 @@
#include "driver/accel_kionix.h"
#include "driver/accel_kx022.h"
#include "driver/accelgyro_bmi160.h"
-#include "driver/bc12/bq24392.h"
#include "driver/led/lm3630a.h"
#include "driver/ppc/sn5s330.h"
#include "driver/tcpm/anx74xx.h"
diff --git a/board/ampton/board.c b/board/ampton/board.c
index 0552be05a6..be6c20f1d3 100644
--- a/board/ampton/board.c
+++ b/board/ampton/board.c
@@ -10,7 +10,6 @@
#include "button.h"
#include "charge_state.h"
#include "common.h"
-#include "driver/bc12/bq24392.h"
#include "driver/ppc/sn5s330.h"
#include "driver/tcpm/it83xx_pd.h"
#include "driver/tcpm/ps8xxx.h"
diff --git a/board/bip/board.c b/board/bip/board.c
index 1222cd00ba..f82d0c41d9 100644
--- a/board/bip/board.c
+++ b/board/bip/board.c
@@ -9,7 +9,6 @@
#include "adc_chip.h"
#include "charge_state.h"
#include "common.h"
-#include "driver/bc12/bq24392.h"
#include "driver/ppc/sn5s330.h"
#include "driver/tcpm/it83xx_pd.h"
#include "driver/tcpm/ps8xxx.h"
diff --git a/board/bobba/board.c b/board/bobba/board.c
index 6c3e3d1a23..a4ef7dadc9 100644
--- a/board/bobba/board.c
+++ b/board/bobba/board.c
@@ -15,7 +15,6 @@
#include "cros_board_info.h"
#include "driver/accel_kionix.h"
#include "driver/accelgyro_bmi160.h"
-#include "driver/bc12/bq24392.h"
#include "driver/charger/bd9995x.h"
#include "driver/ppc/nx20p348x.h"
#include "driver/tcpm/anx7447.h"
diff --git a/board/careena/board.c b/board/careena/board.c
index bb1c19cbc7..a54acb8a17 100644
--- a/board/careena/board.c
+++ b/board/careena/board.c
@@ -17,7 +17,6 @@
#include "driver/accel_kionix.h"
#include "driver/accel_kx022.h"
#include "driver/accelgyro_bmi160.h"
-#include "driver/bc12/bq24392.h"
#include "driver/led/lm3630a.h"
#include "driver/ppc/sn5s330.h"
#include "driver/tcpm/anx74xx.h"
diff --git a/board/fleex/board.c b/board/fleex/board.c
index a6e430217c..3d8e7b8e09 100644
--- a/board/fleex/board.c
+++ b/board/fleex/board.c
@@ -16,7 +16,6 @@
#include "cros_board_info.h"
#include "driver/accel_lis2dh.h"
#include "driver/accelgyro_lsm6dsm.h"
-#include "driver/bc12/bq24392.h"
#include "driver/charger/bd9995x.h"
#include "driver/ppc/nx20p348x.h"
#include "driver/tcpm/anx7447.h"
diff --git a/board/grunt/board.c b/board/grunt/board.c
index 9dda591189..c3b0d05dcf 100644
--- a/board/grunt/board.c
+++ b/board/grunt/board.c
@@ -17,7 +17,6 @@
#include "driver/accel_kionix.h"
#include "driver/accel_kx022.h"
#include "driver/accelgyro_bmi160.h"
-#include "driver/bc12/bq24392.h"
#include "driver/led/lm3630a.h"
#include "driver/ppc/sn5s330.h"
#include "driver/tcpm/anx74xx.h"
diff --git a/board/liara/board.c b/board/liara/board.c
index 63f083b78b..6450ad034b 100644
--- a/board/liara/board.c
+++ b/board/liara/board.c
@@ -17,7 +17,6 @@
#include "driver/accel_kionix.h"
#include "driver/accel_kx022.h"
#include "driver/accelgyro_bmi160.h"
-#include "driver/bc12/bq24392.h"
#include "driver/led/lm3630a.h"
#include "driver/ppc/sn5s330.h"
#include "driver/tcpm/anx74xx.h"
diff --git a/board/meep/board.c b/board/meep/board.c
index bb93e606ba..29352c3924 100644
--- a/board/meep/board.c
+++ b/board/meep/board.c
@@ -16,7 +16,6 @@
#include "cros_board_info.h"
#include "driver/accel_kionix.h"
#include "driver/accelgyro_lsm6dsm.h"
-#include "driver/bc12/bq24392.h"
#include "driver/charger/bd9995x.h"
#include "driver/ppc/nx20p348x.h"
#include "driver/tcpm/anx7447.h"
diff --git a/board/yorp/board.c b/board/yorp/board.c
index 5cbce8d72f..7d4ee431e8 100644
--- a/board/yorp/board.c
+++ b/board/yorp/board.c
@@ -14,7 +14,6 @@
#include "cros_board_info.h"
#include "driver/accel_kionix.h"
#include "driver/accelgyro_lsm6dsm.h"
-#include "driver/bc12/bq24392.h"
#include "driver/charger/bd9995x.h"
#include "driver/ppc/nx20p348x.h"
#include "driver/tcpm/anx7447.h"
diff --git a/board/zoombini/board.c b/board/zoombini/board.c
index a17d1465f4..66ea5b4156 100644
--- a/board/zoombini/board.c
+++ b/board/zoombini/board.c
@@ -15,7 +15,7 @@
#include "compile_time_macros.h"
#include "driver/accelgyro_lsm6dsm.h"
#include "driver/als_opt3001.h"
-#include "driver/bc12/bq24392.h"
+#include "driver/bc12/max14637.h"
#include "driver/led/lm3630a.h"
#include "driver/pmic_tps650x30.h"
#include "driver/ppc/sn5s330.h"
@@ -329,21 +329,21 @@ unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips);
#ifdef BOARD_ZOOMBINI
/* BC 1.2 chip Configuration */
-const struct bq24392_config_t bq24392_config[CONFIG_USB_PD_PORT_COUNT] = {
+const struct max14637_config_t max14637_config[CONFIG_USB_PD_PORT_COUNT] = {
{
.chip_enable_pin = GPIO_USB_C0_BC12_VBUS_ON_L,
.chg_det_pin = GPIO_USB_C0_BC12_CHG_DET,
- .flags = BQ24392_FLAGS_ENABLE_ACTIVE_LOW,
+ .flags = MAX14637_FLAGS_ENABLE_ACTIVE_LOW,
},
{
.chip_enable_pin = GPIO_USB_C1_BC12_VBUS_ON_L,
.chg_det_pin = GPIO_USB_C1_BC12_CHG_DET,
- .flags = BQ24392_FLAGS_ENABLE_ACTIVE_LOW,
+ .flags = MAX14637_FLAGS_ENABLE_ACTIVE_LOW,
},
{
.chip_enable_pin = GPIO_USB_C2_BC12_VBUS_ON_L,
.chg_det_pin = GPIO_USB_C2_BC12_CHG_DET,
- .flags = BQ24392_FLAGS_ENABLE_ACTIVE_LOW,
+ .flags = MAX14637_FLAGS_ENABLE_ACTIVE_LOW,
},
};
diff --git a/board/zoombini/board.h b/board/zoombini/board.h
index 8a2e99d5a4..2369362de1 100644
--- a/board/zoombini/board.h
+++ b/board/zoombini/board.h
@@ -94,7 +94,7 @@
#endif /* defined(BOARD_MEOWTH) */
#ifdef BOARD_ZOOMBINI
-#define CONFIG_BC12_DETECT_BQ24392
+#define CONFIG_BC12_DETECT_MAX14637
#endif /* defined(BOARD_ZOOMBINI) */
#define CONFIG_CHARGER
#define CONFIG_CHARGER_V2
View Lorry Controller Status