diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:01:59 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:01:59 +0800 |
| commit | ce5fa8ff67ece80325c69dabb29318d7ff0b6ffa (patch) | |
| tree | 18b6c8a48a49fd05cc512801d3f23aae5a1a4847 /Documentation/devicetree/bindings/usb | |
| parent | daf83a84eb6e24cabb9098f7b565286c39593ad7 (diff) | |
| parent | 86e8efc80b238bb80ef3deeb322022477fd169f0 (diff) | |
Merge remote-tracking branch 'origin/usb/chipidea' into usb/next
* origin/usb/chipidea: (51 commits)
MLK-22752-3 usb: chipidea: imx: pinctrl for HSIC is optional
MLK-22752-2 usb: chipidea: imx: refine the error handling for hsic
MLK-22752-1 usb: chipidea: imx: change hsic power regulator as optional
MLK-21900-2 usb: chipidea: imx: turn off vbus comparator when suspend
MLK-21900-1 usb: chipidea: imx: group usbmisc operations for PM
...
Diffstat (limited to 'Documentation/devicetree/bindings/usb')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index cfc9f40ab641..c2d72c8fe6a0 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -86,6 +86,7 @@ Optional properties: case, the "idle" state needs to pull down the data and strobe pin and the "active" state needs to pull up the strobe pin. - pinctrl-n: alternate pin modes +- ci-disable-lpm: Some chipidea hardware need to disable low power mode i.mx specific properties - fsl,usbmisc: phandler of non-core register device, with one |