diff options
| -rw-r--r-- | board/cr50/board.h | 3 | ||||
| -rw-r--r-- | board/hammer/board.c | 6 | ||||
| -rw-r--r-- | board/servo_micro/board.c | 3 | ||||
| -rw-r--r-- | board/servo_v4/board.c | 3 | ||||
| -rw-r--r-- | board/tigertail/board.c | 5 | ||||
| -rw-r--r-- | include/usb_i2c.h | 12 |
6 files changed, 7 insertions, 25 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h index c576857bb5..e76caed5dc 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -274,6 +274,9 @@ void board_reboot_ap(void); int board_wipe_tpm(void); int board_is_first_factory_boot(void); +int usb_i2c_board_enable(void); +void usb_i2c_board_disable(void); + void print_ap_state(void); void print_ec_state(void); void print_servo_state(void); diff --git a/board/hammer/board.c b/board/hammer/board.c index c6b5fa778b..c32341aa01 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -54,8 +54,7 @@ const void *const usb_strings[] = { BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT); /****************************************************************************** - * Support I2C bridging over USB, this requires usb_i2c_board_enable and - * usb_i2c_board_disable to be defined to enable and disable the I2C bridge. + * Support I2C bridging over USB. */ #ifdef SECTION_IS_RW @@ -78,9 +77,6 @@ const struct pwm_t pwm_channels[] = { }; BUILD_ASSERT(ARRAY_SIZE(pwm_channels) == PWM_CH_COUNT); -int usb_i2c_board_enable(void) { return EC_SUCCESS; } -void usb_i2c_board_disable(void) {} - int usb_i2c_board_is_enabled(void) { /* Disable I2C passthrough when the system is locked */ diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c index 61827ecd2c..b8f93b605f 100644 --- a/board/servo_micro/board.c +++ b/board/servo_micro/board.c @@ -236,8 +236,7 @@ void usb_spi_board_disable(struct usb_spi_config const *config) USB_SPI_CONFIG(usb_spi, USB_IFACE_SPI, USB_EP_SPI); /****************************************************************************** - * Support I2C bridging over USB, this requires usb_i2c_board_enable and - * usb_i2c_board_disable to be defined to enable and disable the SPI bridge. + * Support I2C bridging over USB. */ /* I2C ports */ diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index e12f60f448..8511788e7a 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -176,8 +176,7 @@ BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT); /****************************************************************************** - * Support I2C bridging over USB, this requires usb_i2c_board_enable and - * usb_i2c_board_disable to be defined to enable and disable the SPI bridge. + * Support I2C bridging over USB. */ /* I2C ports */ diff --git a/board/tigertail/board.c b/board/tigertail/board.c index 6b68ce8444..8963c7e80a 100644 --- a/board/tigertail/board.c +++ b/board/tigertail/board.c @@ -99,8 +99,7 @@ BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); /****************************************************************************** - * Support I2C bridging over USB, this requires usb_i2c_board_enable and - * usb_i2c_board_disable to be defined to enable and disable the SPI bridge. + * Support I2C bridging over USB. */ /* I2C ports */ @@ -110,8 +109,6 @@ const struct i2c_port_t i2c_ports[] = { }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); -int usb_i2c_board_enable(void) {return EC_SUCCESS; } -void usb_i2c_board_disable(void) {} int usb_i2c_board_is_enabled(void) { return 1; } /****************************************************************************** diff --git a/include/usb_i2c.h b/include/usb_i2c.h index c464e062a5..3e8eb3e7e5 100644 --- a/include/usb_i2c.h +++ b/include/usb_i2c.h @@ -156,18 +156,6 @@ void usb_i2c_deferred(struct usb_i2c_config const *config); */ /** - * Enable the I2C device - * - * @return EC_SUCCESS or non-zero error code. - */ -int usb_i2c_board_enable(void); - -/** - * Disable the I2C device - */ -void usb_i2c_board_disable(void); - -/** * Check if the I2C device is enabled * * @return 1 if enabled, 0 if disabled. |