diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-18 14:29:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-18 14:29:13 +0300 |
| commit | b38bcc8e12062452ae86158a3bbc4235fd395d91 (patch) | |
| tree | e4b9ff061d2a093a5f358d9df7626feb636324e7 /drivers/usb/chipidea/ci_hdrc_imx.h | |
| parent | 347bc8cb26388791c5881a3775cb14a3f765a674 (diff) | |
| parent | 4d6141288c33b73027260e73df262464cbe1fd0d (diff) | |
| download | linux-b38bcc8e12062452ae86158a3bbc4235fd395d91.tar.xz | |
Merge tag 'usb-ci-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes:
- Improve the Vbus handler
- Improve the HSIC handler for i.mx serial SoC
- Some other tiny changes
* tag 'usb-ci-v5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
usb: chipidea: imx: pinctrl for HSIC is optional
usb: chipidea: imx: refine the error handling for hsic
usb: chipidea: imx: change hsic power regulator as optional
usb: chipidea: imx: check data->usbmisc_data against NULL before access
usb: chipidea: core: change vbus-regulator as optional
usb: chipidea: imx: enable vbus and id wakeup only for OTG events
usb: chipidea: udc: protect usb interrupt enable
usb: chipidea: udc: add new API ci_hdrc_gadget_connect
Diffstat (limited to 'drivers/usb/chipidea/ci_hdrc_imx.h')
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_imx.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h index c842e03f8767..de2aac9a2868 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.h +++ b/drivers/usb/chipidea/ci_hdrc_imx.h @@ -22,6 +22,8 @@ struct imx_usbmisc_data { unsigned int evdo:1; /* set external vbus divider option */ unsigned int ulpi:1; /* connected to an ULPI phy */ unsigned int hsic:1; /* HSIC controlller */ + unsigned int ext_id:1; /* ID from exteranl event */ + unsigned int ext_vbus:1; /* Vbus from exteranl event */ }; int imx_usbmisc_init(struct imx_usbmisc_data *data); |