diff options
-rw-r--r-- | driver/bc12/pi3usb9201.c | 13 | ||||
-rw-r--r-- | driver/bc12/pi3usb9201.h | 16 |
2 files changed, 15 insertions, 14 deletions
diff --git a/driver/bc12/pi3usb9201.c b/driver/bc12/pi3usb9201.c index 3368b1fe25..d70a3e53f6 100644 --- a/driver/bc12/pi3usb9201.c +++ b/driver/bc12/pi3usb9201.c @@ -21,17 +21,6 @@ #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -enum pi3usb9201_mode { - PI3USB9201_POWER_DOWN, - PI3USB9201_SDP_HOST_MODE, - PI3USB9201_DCP_HOST_MODE, - PI3USB9201_CDP_HOST_MODE, - PI3USB9201_CLIENT_MODE, - PI3USB9201_RESERVED_1, - PI3USB9201_RESERVED_2, - PI3USB9201_USB_PATH_ON, -}; - enum pi3usb9201_client_sts { CHG_OTHER = 0, CHG_2_4A, @@ -115,7 +104,7 @@ static int pi3usb9201_set_mode(int port, int desired_mode) { return pi3usb9201_raw(port, PI3USB9201_REG_CTRL_1, PI3USB9201_REG_CTRL_1_MODE_MASK, - desired_mode << 1); + desired_mode << PI3USB9201_REG_CTRL_1_MODE_SHIFT); } static void bc12_update_charge_manager(int port) diff --git a/driver/bc12/pi3usb9201.h b/driver/bc12/pi3usb9201.h index 589aaab83e..a710a5b2e9 100644 --- a/driver/bc12/pi3usb9201.h +++ b/driver/bc12/pi3usb9201.h @@ -18,8 +18,9 @@ /* Control_1 regiter bit definitions */ #define PI3USB9201_REG_CTRL_1_INT_MASK (1 << 0) -#define PI3USB9201_REG_CTRL_1_MODE (1 << 1) -#define PI3USB9201_REG_CTRL_1_MODE_MASK (0x7 << 1) +#define PI3USB9201_REG_CTRL_1_MODE_SHIFT 1 +#define PI3USB9201_REG_CTRL_1_MODE_MASK ( \ + 0x7 << PI3USB9201_REG_CTRL_1_MODE_SHIFT) /* Control_2 regiter bit definitions */ #define PI3USB9201_REG_CTRL_2_AUTO_SW (1 << 1) @@ -35,6 +36,17 @@ struct pi3usb2901_config_t { const int i2c_addr; }; +enum pi3usb9201_mode { + PI3USB9201_POWER_DOWN, + PI3USB9201_SDP_HOST_MODE, + PI3USB9201_DCP_HOST_MODE, + PI3USB9201_CDP_HOST_MODE, + PI3USB9201_CLIENT_MODE, + PI3USB9201_RESERVED_1, + PI3USB9201_RESERVED_2, + PI3USB9201_USB_PATH_ON, +}; + /* Configuration struct defined at board level */ extern const struct pi3usb2901_config_t pi3usb2901_bc12_chips[]; |