diff options
| author | Randall Spangler <rspangler@chromium.org> | 2017-07-25 16:22:27 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-07-31 21:39:39 -0700 |
| commit | 00ea73ab166ebc8a2c4b5693b7fa776c76c7fe45 (patch) | |
| tree | c99009ec5bce12c97a85a32695bd7f0f435c1e2c /board/hammer/board.c | |
| parent | ddbfe690e294e595c6ed3511dcf417410d9b2804 (diff) | |
| download | chrome-ec-00ea73ab166ebc8a2c4b5693b7fa776c76c7fe45.tar.gz | |
usb_i2c: Fail if board I2C bridge is disabled
Add usb_i2c_board_is_enabled().
On Cr50, this is now also connected to the I2C CCD capability. The
USB-I2C bridge can only be used when the capability is available.
On other platforms (Servo V4, etc.) where usb_i2c_board_enable() is
a no-op, add a dummy implementation which always returns true.
See go/cr50-ccd-wp for more information.
BUG=b:62537474
BRANCH=cr50
TEST=manual with CR50_DEV=1
Connect host PC to dev board USB port
On host PC:
sudo servod -c ccd_cr50.xml -c reef_r1_inas.xml
dut-control pp3300_ec_shv_reg --> fail, error 0x8001
ccdoops --> reset I2C config
ccd i2c disable --> I2C disabled
On host PC:
sudo servod -c ccd_cr50.xml -c reef_r1_inas.xml
dut-control pp3300_ec_shv_reg --> fail, error 0x0006
ccd i2c enable --> I2C enabled
ccdunlock --> I2C disabled
ccdoops --> I2C enabled
ccdset i2c unlesslocked
ccdlock --> I2C disabled
ccdunlock --> I2C enabled
Change-Id: Ia3df32e239a5f7c5915bc6c7e408ce0dc8b26c89
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/590577
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Diffstat (limited to 'board/hammer/board.c')
| -rw-r--r-- | board/hammer/board.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/board/hammer/board.c b/board/hammer/board.c index dcab35ca20..a3e90dc14b 100644 --- a/board/hammer/board.c +++ b/board/hammer/board.c @@ -80,6 +80,7 @@ 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) { return 1; } #ifdef CONFIG_KEYBOARD_BOARD_CONFIG struct keyboard_scan_config keyscan_config = { |