diff options
Diffstat (limited to 'driver/bc12/pi3usb9281.c')
| -rw-r--r-- | driver/bc12/pi3usb9281.c | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/driver/bc12/pi3usb9281.c b/driver/bc12/pi3usb9281.c index 3c3a0a7256..9e92d0f273 100644 --- a/driver/bc12/pi3usb9281.c +++ b/driver/bc12/pi3usb9281.c @@ -1,10 +1,11 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * * Pericom PI3USB3281 USB port switch driver. */ +#include "builtin/assert.h" #include "charge_manager.h" #include "common.h" #include "console.h" @@ -19,9 +20,9 @@ #include "usb_pd.h" #include "util.h" - /* Console output macros */ +/* Console output macros */ #define CPUTS(outstr) cputs(CC_USBCHARGE, outstr) -#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) +#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args) /* I2C address */ #define PI3USB9281_I2C_ADDR_FLAGS 0x25 @@ -30,10 +31,10 @@ #define PI3USB9281_SW_RESET_DELAY 20 /* Wait after a charger is detected to debounce pin contact order */ -#define PI3USB9281_DETECT_DEBOUNCE_MS 1000 -#define PI3USB9281_RESET_DEBOUNCE_MS 100 -#define PI3USB9281_RESET_STARTUP_DELAY (200 * MSEC) -#define PI3USB9281_RESET_STARTUP_DELAY_INTERVAL_MS 40 +#define PI3USB9281_DETECT_DEBOUNCE_MS 1000 +#define PI3USB9281_RESET_DEBOUNCE_MS 100 +#define PI3USB9281_RESET_STARTUP_DELAY (200 * MSEC) +#define PI3USB9281_RESET_STARTUP_DELAY_INTERVAL_MS 40 /* Store the state of our USB data switches so that they can be restored. */ static int usb_switch_state[CONFIG_USB_PD_PORT_MAX_COUNT]; @@ -69,8 +70,7 @@ static uint8_t pi3usb9281_do_read(int port, uint8_t reg, int with_lock) if (with_lock) select_chip(port); - res = i2c_read8(chip->i2c_port, PI3USB9281_I2C_ADDR_FLAGS, - reg, &val); + res = i2c_read8(chip->i2c_port, PI3USB9281_I2C_ADDR_FLAGS, reg, &val); if (with_lock) unselect_chip(port); @@ -91,8 +91,8 @@ static uint8_t pi3usb9281_read(int port, uint8_t reg) return pi3usb9281_do_read(port, reg, 1); } -static int pi3usb9281_do_write( - int port, uint8_t reg, uint8_t val, int with_lock) +static int pi3usb9281_do_write(int port, uint8_t reg, uint8_t val, + int with_lock) { struct pi3usb9281_config *chip = &pi3usb9281_chips[port]; int res; @@ -100,8 +100,7 @@ static int pi3usb9281_do_write( if (with_lock) select_chip(port); - res = i2c_write8(chip->i2c_port, PI3USB9281_I2C_ADDR_FLAGS, - reg, val); + res = i2c_write8(chip->i2c_port, PI3USB9281_I2C_ADDR_FLAGS, reg, val); if (with_lock) unselect_chip(port); @@ -120,8 +119,9 @@ static int pi3usb9281_write(int port, uint8_t reg, uint8_t val) static int pi3usb9281_do_write_ctrl(int port, uint8_t ctrl, int with_lock) { return pi3usb9281_do_write(port, PI3USB9281_REG_CONTROL, - (ctrl & PI3USB9281_CTRL_MASK) | - PI3USB9281_CTRL_RSVD_1, with_lock); + (ctrl & PI3USB9281_CTRL_MASK) | + PI3USB9281_CTRL_RSVD_1, + with_lock); } static int pi3usb9281_write_ctrl(int port, uint8_t ctrl) @@ -156,7 +156,6 @@ static void pi3usb9281_init(int port) pi3usb9281_enable_interrupts(port); } - int pi3usb9281_enable_interrupts(int port) { uint8_t ctrl; @@ -297,7 +296,7 @@ static int pc3usb9281_read_interrupt(int port) do { /* Read (& clear) possible attach & detach interrupt */ if (pi3usb9281_get_interrupts(port) & - PI3USB9281_INT_ATTACH_DETACH) + PI3USB9281_INT_ATTACH_DETACH) return EC_SUCCESS; msleep(PI3USB9281_RESET_STARTUP_DELAY_INTERVAL_MS); } while (get_time().val < timeout.val); @@ -418,7 +417,6 @@ static uint32_t bc12_detect(int port) static void pi3usb9281_usb_charger_task_event(const int port, uint32_t evt) { - /* Interrupt from the Pericom chip, determine charger type */ if (evt & USB_CHG_EVENT_BC12) { /* Read interrupt register to clear on chip */ @@ -443,7 +441,8 @@ static void pi3usb9281_usb_charger_task_event(const int port, uint32_t evt) if (evt & USB_CHG_EVENT_VBUS) { pi3usb9281_enable_interrupts(port); if (!IS_ENABLED(CONFIG_USB_PD_VBUS_DETECT_TCPC)) - CPRINTS("VBUS p%d %d", port, pd_snk_is_vbus_provided(port)); + CPRINTS("VBUS p%d %d", port, + pd_snk_is_vbus_provided(port)); } } |