diff options
| author | Alec Berg <alecaberg@chromium.org> | 2015-07-10 17:39:54 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-07-13 03:18:32 +0000 |
| commit | 16d40b0b3c567a5e18ea28469a09f860819d3fdd (patch) | |
| tree | d1ec5c17739e7e0d4aae60ae3b40d845f0ec45e2 /board/lucid | |
| parent | 79195818caeff76a6eb3a3d4991b095920b55e33 (diff) | |
| download | chrome-ec-16d40b0b3c567a5e18ea28469a09f860819d3fdd.tar.gz | |
cleanup: define one set of USB charger voltage and min current
Remove duplicate definitions of USB charger min current across
boards and make one set of defines for standard USB charger voltage
and minimum USB charger current.
BUG=none
BRANCH=smaug
TEST=make -j buildall
Change-Id: Ib842fafb317417c8de9a67d314fdde4c1e47ad9d
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/284956
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/lucid')
| -rw-r--r-- | board/lucid/board.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/board/lucid/board.c b/board/lucid/board.c index 7379dfcc25..4fadc6083c 100644 --- a/board/lucid/board.c +++ b/board/lucid/board.c @@ -16,13 +16,11 @@ #include "i2c.h" #include "registers.h" #include "task.h" +#include "usb_charge.h" #include "util.h" #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -/* Default input current limit when VBUS is present */ -#define DEFAULT_CURR_LIMIT 500 /* mA */ - void board_config_pre_init(void) { /* enable SYSCFG clock */ @@ -45,8 +43,8 @@ static void update_vbus_supplier(int vbus_level) { struct charge_port_info charge; - charge.voltage = USB_BC12_CHARGE_VOLTAGE; - charge.current = vbus_level ? DEFAULT_CURR_LIMIT : 0; + charge.voltage = USB_CHARGER_VOLTAGE_MV; + charge.current = vbus_level ? USB_CHARGER_MIN_CURR_MA : 0; charge_manager_update_charge(CHARGE_SUPPLIER_VBUS, 0, &charge); } @@ -99,7 +97,7 @@ static void board_init(void) * TODO: use built-in USB peripheral to detect BC1.2 suppliers an * update charge manager. */ - charge_none.voltage = USB_BC12_CHARGE_VOLTAGE; + charge_none.voltage = USB_CHARGER_VOLTAGE_MV; charge_none.current = 0; for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) { charge_manager_update_charge(CHARGE_SUPPLIER_PROPRIETARY, |