diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-24 00:26:10 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-03-24 00:26:10 +0100 |
| commit | cd427485357c0c4b99f69719251baacf25946e11 (patch) | |
| tree | ca1ff7eb2277dec42f1e20adc0b98c3c215ecfbe /Documentation/devicetree/bindings/usb | |
| parent | powerpc/book3s: Fix CFAR clobbering issue in machine check handler. (diff) | |
| parent | fsl/pci: The new pci suspend/resume implementation (diff) | |
| download | linux-cd427485357c0c4b99f69719251baacf25946e11.tar.xz linux-cd427485357c0c4b99f69719251baacf25946e11.zip | |
Merge remote-tracking branch 'scott/next' into next
Freescale updates from Scott. Mostly support for critical
and machine check exceptions on 64-bit BookE, some new
PCI suspend/resume work and misc bits.
Diffstat (limited to 'Documentation/devicetree/bindings/usb')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/fsl-usb.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/usb/fsl-usb.txt b/Documentation/devicetree/bindings/usb/fsl-usb.txt index bd5723f0b67e..4779c029b675 100644 --- a/Documentation/devicetree/bindings/usb/fsl-usb.txt +++ b/Documentation/devicetree/bindings/usb/fsl-usb.txt @@ -8,7 +8,9 @@ and additions : Required properties : - compatible : Should be "fsl-usb2-mph" for multi port host USB controllers, or "fsl-usb2-dr" for dual role USB controllers - or "fsl,mpc5121-usb2-dr" for dual role USB controllers of MPC5121 + or "fsl,mpc5121-usb2-dr" for dual role USB controllers of MPC5121. + Wherever applicable, the IP version of the USB controller should + also be mentioned (for eg. fsl-usb2-dr-v2.2 for bsc9132). - phy_type : For multi port host USB controllers, should be one of "ulpi", or "serial". For dual role USB controllers, should be one of "ulpi", "utmi", "utmi_wide", or "serial". |