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/samus_pd | |
| 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/samus_pd')
| -rw-r--r-- | board/samus_pd/board.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c index c162f760a1..2325f7090d 100644 --- a/board/samus_pd/board.c +++ b/board/samus_pd/board.c @@ -33,9 +33,6 @@ /* Amount to offset the input current limit when sending to EC */ #define INPUT_CURRENT_LIMIT_OFFSET_MA 192 -/* Default input current limit when VBUS is present */ -#define DEFAULT_CURR_LIMIT 500 /* mA */ - /* * When battery is high, system may not be pulling full current. Also, when * high AND input voltage is below boost bypass, then limit input current @@ -120,8 +117,8 @@ void vbus0_evt(enum gpio_signal signal) * ourselves, then update the VBUS supplier. */ if (!vbus_level || !gpio_get_level(GPIO_USB_C0_5V_EN)) { - 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); } @@ -146,8 +143,8 @@ void vbus1_evt(enum gpio_signal signal) * ourselves, then update the VBUS supplier. */ if (!vbus_level || !gpio_get_level(GPIO_USB_C1_5V_EN)) { - 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, 1, &charge); } @@ -288,7 +285,7 @@ static void board_init(void) gpio_enable_interrupt(GPIO_USB_C1_VBUS_WAKE); /* Initialize all pericom charge suppliers to 0 */ - 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, @@ -309,8 +306,8 @@ static void board_init(void) } /* Initialize VBUS supplier based on whether or not VBUS is present */ - 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; if (gpio_get_level(GPIO_USB_C0_VBUS_WAKE)) charge_manager_update_charge(CHARGE_SUPPLIER_VBUS, 0, &charge_vbus); |