diff options
| author | Nick Sanders <nsanders@chromium.org> | 2016-10-28 16:23:12 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-11-02 17:39:56 -0700 |
| commit | a04fc68e721c8165ce570d8929aef1330cf72df1 (patch) | |
| tree | 309d560207dc27ca6ee72b3593630282c7c93434 /board | |
| parent | d4bff62d36cf42e7b28929baff64b0d99bf95362 (diff) | |
| download | chrome-ec-a04fc68e721c8165ce570d8929aef1330cf72df1.tar.gz | |
usb_i2c: refactor into common
This combines stm32 and chip/g usb_i2c interfaces so they
will not diverge. Note that this fixes the chip/g implementation
to use 8-bit i2c addresses.
BUG=chrome-os-partner:57059
BRANCH=none
TEST=servod interacts with servo_micro and servo_v4
Change-Id: Ibff217d84b132556202c8a71e3d42c07d546c634
Reviewed-on: https://chromium-review.googlesource.com/405108
Commit-Ready: Nick Sanders <nsanders@chromium.org>
Tested-by: Nick Sanders <nsanders@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Diffstat (limited to 'board')
| -rw-r--r-- | board/servo_micro/board.c | 4 | ||||
| -rw-r--r-- | board/servo_micro/board.h | 1 | ||||
| -rw-r--r-- | board/servo_v4/board.c | 5 | ||||
| -rw-r--r-- | board/servo_v4/board.h | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/board/servo_micro/board.c b/board/servo_micro/board.c index 0b74826352..853de87746 100644 --- a/board/servo_micro/board.c +++ b/board/servo_micro/board.c @@ -130,6 +130,7 @@ const void *const usb_strings[] = { [USB_STR_PRODUCT] = USB_STRING_DESC("Servo Micro"), [USB_STR_SERIALNO] = 0, [USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32), + [USB_STR_I2C_NAME] = USB_STRING_DESC("I2C"), [USB_STR_USART4_STREAM_NAME] = USB_STRING_DESC("Servo UART3"), [USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Servo EC Shell"), [USB_STR_USART3_STREAM_NAME] = USB_STRING_DESC("Servo UART2"), @@ -198,7 +199,8 @@ const struct i2c_port_t i2c_ports[] = { }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); -USB_I2C_CONFIG(usb_i2c, USB_IFACE_I2C, USB_EP_I2C); +int usb_i2c_board_enable(void) {return EC_SUCCESS; } +void usb_i2c_board_disable(int debounce) {} /****************************************************************************** diff --git a/board/servo_micro/board.h b/board/servo_micro/board.h index b2543c3ac3..2a11e7707c 100644 --- a/board/servo_micro/board.h +++ b/board/servo_micro/board.h @@ -100,6 +100,7 @@ enum usb_strings { USB_STR_PRODUCT, USB_STR_SERIALNO, USB_STR_VERSION, + USB_STR_I2C_NAME, USB_STR_USART4_STREAM_NAME, USB_STR_CONSOLE_NAME, USB_STR_USART3_STREAM_NAME, diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c index 6b742d3ebd..eb884b4822 100644 --- a/board/servo_v4/board.c +++ b/board/servo_v4/board.c @@ -180,6 +180,7 @@ const void *const usb_strings[] = { [USB_STR_PRODUCT] = USB_STRING_DESC("Servo V4"), [USB_STR_SERIALNO] = USB_STRING_DESC("1234-a"), [USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32), + [USB_STR_I2C_NAME] = USB_STRING_DESC("I2C"), [USB_STR_CONSOLE_NAME] = USB_STRING_DESC("Servo EC Shell"), [USB_STR_USART3_STREAM_NAME] = USB_STRING_DESC("DUT UART"), [USB_STR_USART4_STREAM_NAME] = USB_STRING_DESC("Atmega UART"), @@ -202,8 +203,8 @@ const struct i2c_port_t i2c_ports[] = { }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); -USB_I2C_CONFIG(usb_i2c, USB_IFACE_I2C, USB_EP_I2C); - +int usb_i2c_board_enable(void) {return EC_SUCCESS; } +void usb_i2c_board_disable(int debounce) {} /****************************************************************************** diff --git a/board/servo_v4/board.h b/board/servo_v4/board.h index eaad6385b2..24cff51544 100644 --- a/board/servo_v4/board.h +++ b/board/servo_v4/board.h @@ -93,6 +93,7 @@ enum usb_strings { USB_STR_PRODUCT, USB_STR_SERIALNO, USB_STR_VERSION, + USB_STR_I2C_NAME, USB_STR_CONSOLE_NAME, USB_STR_USART3_STREAM_NAME, USB_STR_USART4_STREAM_NAME, |