diff options
| author | Anton Staaf <robotboy@chromium.org> | 2014-11-11 12:05:08 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-13 03:14:26 +0000 |
| commit | 079742b1ffb352cb0149d4fea232747e83dd6209 (patch) | |
| tree | e0079651e3b04a07869d784547ec31eab22a628f /include | |
| parent | 4340685cf9ab9335256d63a8a551faa85af4f892 (diff) | |
| download | chrome-ec-079742b1ffb352cb0149d4fea232747e83dd6209.tar.gz | |
USB: Enable finer grain control over init process
Previously enabling USB would automatically (using an
init hook) initialize the USB peripheral. This would
take over the GPIO lines assigned to the USB module.
This is not OK on Ryu for Case Closed Debug because it
interferes with the AP's access to the USB 2.0 lines
even when not in Case Close Debug mode.
This change adds a configuration option to inhibit this
default initialization of the USB peripheral. It also
renames the existing CONFIG_USB_INHIBIT to
CONFIG_USB_INHIBIT_CONNECT now that there are two
possible inhibitions.
Signed-off-by: Anton Staaf <robotboy@chromium.org>
BRANCH=None
BUG=None
TEST=make buildall -j
Enable console on ryu_p2 and discovery-stm32f072 board
Verify that it works on both
Change-Id: I6734357131b4356e3d4164349d6c74deac196ce5
Reviewed-on: https://chromium-review.googlesource.com/229138
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Commit-Queue: Anton Staaf <robotboy@chromium.org>
Tested-by: Anton Staaf <robotboy@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/config.h | 5 | ||||
| -rw-r--r-- | include/usb_api.h | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/config.h b/include/config.h index 92cd267121..324646f7e0 100644 --- a/include/config.h +++ b/include/config.h @@ -1129,8 +1129,11 @@ /* Compile chip support for the USB device controller */ #undef CONFIG_USB +/* Disable automatic connection of USB peripheral */ +#undef CONFIG_USB_INHIBIT_CONNECT + /* Disable automatic initialization of USB peripheral */ -#undef CONFIG_USB_INHIBIT +#undef CONFIG_USB_INHIBIT_INIT /* Support simple control of power to the device's USB ports */ #undef CONFIG_USB_PORT_POWER_DUMB diff --git a/include/usb_api.h b/include/usb_api.h index feeb6abb27..dc0a0fd654 100644 --- a/include/usb_api.h +++ b/include/usb_api.h @@ -14,9 +14,10 @@ /* * Initialize the USB peripheral, enabling its clock and configuring the DP/DN - * GPIOs correctly. This function is called via an init hook, but may need to - * be called again if usb_release is called. This function will call - * usb_connect by default unless CONFIG_USB_INHIBIT is defined. + * GPIOs correctly. This function is called via an init hook (unless the board + * defined CONFIG_USB_INHIBIT_INIT), but may need to be called again if + * usb_release is called. This function will call usb_connect by default + * unless CONFIG_USB_INHIBIT_CONNECT is defined. */ void usb_init(void); |