diff options
| author | Greg Kroah-Hartman | 2019-07-05 07:19:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-05 07:19:28 +0200 |
| commit | 2bc8bb813cba6e699b29fd0b30720288866a5e5d (patch) | |
| tree | c18bfc71a79b62666687ed402655a69a19a8ccf1 /include/linux/usb | |
| parent | Revert "usb: gadget: storage: Remove warning message" (diff) | |
| parent | usb: chipidea: msm: Use devm_platform_ioremap_resource() (diff) | |
| download | kernel-qcow2-linux-2bc8bb813cba6e699b29fd0b30720288866a5e5d.tar.gz kernel-qcow2-linux-2bc8bb813cba6e699b29fd0b30720288866a5e5d.tar.xz kernel-qcow2-linux-2bc8bb813cba6e699b29fd0b30720288866a5e5d.zip | |
Merge tag 'usb-ci-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
- Add imx7ulp support.
- Some tiny improvements, no function change.
* tag 'usb-ci-v5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb:
usb: chipidea: msm: Use devm_platform_ioremap_resource()
usb: chipidea: imx: Use devm_platform_ioremap_resource()
usb: chipidea: Use dev_err() instead of pr_err()
usb: chipidea: imx: "fsl,usbphy" phandle is not mandatory now
usb: chipidea: imx: add imx7ulp support
Diffstat (limited to 'include/linux/usb')
| -rw-r--r-- | include/linux/usb/chipidea.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/usb/chipidea.h b/include/linux/usb/chipidea.h index 911e05af671e..edd89b7c8f18 100644 --- a/include/linux/usb/chipidea.h +++ b/include/linux/usb/chipidea.h @@ -61,6 +61,7 @@ struct ci_hdrc_platform_data { #define CI_HDRC_OVERRIDE_PHY_CONTROL BIT(12) /* Glue layer manages phy */ #define CI_HDRC_REQUIRES_ALIGNED_DMA BIT(13) #define CI_HDRC_IMX_IS_HSIC BIT(14) +#define CI_HDRC_PMQOS BIT(15) enum usb_dr_mode dr_mode; #define CI_HDRC_CONTROLLER_RESET_EVENT 0 #define CI_HDRC_CONTROLLER_STOPPED_EVENT 1 |