diff options
| author | Scott Collyer <scollyer@google.com> | 2018-09-27 12:56:07 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-02 05:19:05 -0700 |
| commit | 3b7ac6bedfa39ee10e000c705a400e2ede8fa4e5 (patch) | |
| tree | 52d26f25605bb13180c37543bf7267c20b0f5702 /baseboard | |
| parent | b729f9f10151438a86779d6c939b86572c0c1cda (diff) | |
| download | chrome-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 'baseboard')
| -rw-r--r-- | baseboard/grunt/baseboard.c | 8 | ||||
| -rw-r--r-- | baseboard/grunt/baseboard.h | 2 | ||||
| -rw-r--r-- | baseboard/octopus/baseboard.c | 8 | ||||
| -rw-r--r-- | baseboard/octopus/baseboard.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c index 503b989a32..8243106a0a 100644 --- a/baseboard/grunt/baseboard.c +++ b/baseboard/grunt/baseboard.c @@ -17,7 +17,7 @@ #include "driver/accel_kionix.h" #include "driver/accel_kx022.h" #include "driver/accelgyro_bmi160.h" -#include "driver/bc12/bq24392.h" +#include "driver/bc12/max14637.h" #include "driver/ppc/sn5s330.h" #include "driver/tcpm/anx74xx.h" #include "driver/tcpm/ps8xxx.h" @@ -147,16 +147,16 @@ struct ppc_config_t ppc_chips[] = { unsigned int ppc_cnt = ARRAY_SIZE(ppc_chips); /* 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] = { [USB_PD_PORT_ANX74XX] = { .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, }, [USB_PD_PORT_PS8751] = { .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, }, }; diff --git a/baseboard/grunt/baseboard.h b/baseboard/grunt/baseboard.h index fdb0752c39..975c5fde36 100644 --- a/baseboard/grunt/baseboard.h +++ b/baseboard/grunt/baseboard.h @@ -52,7 +52,7 @@ #define CONFIG_BATTERY_REVIVE_DISCONNECT #define CONFIG_BATTERY_SMART -#define CONFIG_BC12_DETECT_BQ24392 +#define CONFIG_BC12_DETECT_MAX14637 #define CONFIG_CHARGER #define CONFIG_CHARGER_V2 #define CONFIG_CHARGE_MANAGER diff --git a/baseboard/octopus/baseboard.c b/baseboard/octopus/baseboard.c index b1f8b11fb0..beb2e1754d 100644 --- a/baseboard/octopus/baseboard.c +++ b/baseboard/octopus/baseboard.c @@ -10,7 +10,7 @@ #include "chipset.h" #include "common.h" #include "console.h" -#include "driver/bc12/bq24392.h" +#include "driver/bc12/max14637.h" #include "driver/ppc/nx20p348x.h" #include "gpio.h" #include "hooks.h" @@ -76,16 +76,16 @@ const int usb_port_enable[USB_PORT_COUNT] = { /******************************************************************************/ /* 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, .chg_det_pin = GPIO_USB_C0_BC12_CHG_DET_L, - .flags = BQ24392_FLAGS_CHG_DET_ACTIVE_LOW, + .flags = MAX14637_FLAGS_CHG_DET_ACTIVE_LOW, }, { .chip_enable_pin = GPIO_USB_C1_BC12_VBUS_ON, .chg_det_pin = GPIO_USB_C1_BC12_CHG_DET_L, - .flags = BQ24392_FLAGS_CHG_DET_ACTIVE_LOW, + .flags = MAX14637_FLAGS_CHG_DET_ACTIVE_LOW, }, }; diff --git a/baseboard/octopus/baseboard.h b/baseboard/octopus/baseboard.h index 9311ab39ba..f1d3bc0d0f 100644 --- a/baseboard/octopus/baseboard.h +++ b/baseboard/octopus/baseboard.h @@ -187,7 +187,7 @@ #define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT #define CONFIG_USB_PD_TCPM_MUX #define CONFIG_USB_PD_TCPM_TCPCI -#define CONFIG_BC12_DETECT_BQ24392 +#define CONFIG_BC12_DETECT_MAX14637 #define CONFIG_CMD_PD_CONTROL #define CONFIG_CMD_PPC_DUMP |