diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
| commit | 3985b18650bf2365debb142624f877007b31ada2 (patch) | |
| tree | ac8910bfd2e800ac840c93ae84013e5b1f2cd19d /Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | |
| parent | 5b6d12b532bb2e4f114d8a2904eaac1ece43ea20 (diff) | |
| parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linarotracking-ll-linux-linaro-extra-20151104.0ll-20151022.1linux-linaro-4.3-rc6-2015.10ll_20151022.1
Conflicting files:
Diffstat (limited to 'Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt index a057b75ba4b5..db48bad84228 100644 --- a/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt +++ b/Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt @@ -46,6 +46,11 @@ Optional properties: (4 bytes), This register represents the maximum length of a the burst in 32-bit words while moving data from the USB bus to system memory, changing this value takes effect only the SBUSCFG.AHBBRST is 0. +- extcon: phandles to external connector devices. First phandle should point to + external connector, which provide "USB" cable events, the second should point + to external connector device, which provide "USB-HOST" cable events. If one + of the external connector devices is not required, empty <0> phandle should + be specified. Example: @@ -62,4 +67,5 @@ Example: ahb-burst-config = <0x0>; tx-burst-size-dword = <0x10>; /* 64 bytes */ rx-burst-size-dword = <0x10>; + extcon = <0>, <&usb_id>; }; |