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/oak | |
| 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/oak')
| -rw-r--r-- | board/oak/board.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/board/oak/board.c b/board/oak/board.c index bf94c726e2..1fef68fb3c 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -32,6 +32,7 @@ #include "temp_sensor_chip.h" #include "thermal.h" #include "timer.h" +#include "usb_charge.h" #include "usb_mux.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" @@ -43,9 +44,6 @@ #define GPIO_KB_INPUT (GPIO_INPUT | GPIO_PULL_UP | GPIO_INT_BOTH) #define GPIO_KB_OUTPUT GPIO_ODR_HIGH -/* Default input current limit when VBUS is present */ -#define DEFAULT_CURR_LIMIT 500 /* mA */ - /* Dispaly port hardware can connect to port 0, 1 or neither. */ #define PD_PORT_NONE -1 @@ -237,10 +235,10 @@ static void board_init(void) gpio_enable_interrupt(GPIO_AP_RESET_L); #endif - charge_none.voltage = USB_BC12_CHARGE_VOLTAGE; + charge_none.voltage = USB_CHARGER_VOLTAGE_MV; charge_none.current = 0; - charge_vbus.voltage = USB_BC12_CHARGE_VOLTAGE; - charge_vbus.current = DEFAULT_CURR_LIMIT; + charge_vbus.voltage = USB_CHARGER_VOLTAGE_MV; + charge_vbus.current = USB_CHARGER_MIN_CURR_MA; for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++) { /* Initialize all pericom charge suppliers to 0 */ charge_manager_update_charge( |