diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 18:46:14 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 18:46:14 +0100 |
| commit | 0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch) | |
| tree | 1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /Documentation/devicetree/bindings/usb/usbmisc-imx.txt | |
| parent | Input: evdev - flush pending events on clock type change (diff) | |
| parent | linux 3.19-rc4 (diff) | |
| download | linux-0c49cd295d42d0032af11d55e2140dbec11dc8d0.tar.xz linux-0c49cd295d42d0032af11d55e2140dbec11dc8d0.zip | |
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'Documentation/devicetree/bindings/usb/usbmisc-imx.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/usbmisc-imx.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/usbmisc-imx.txt b/Documentation/devicetree/bindings/usb/usbmisc-imx.txt index 97ce94e1a6cc..c101a4b17131 100644 --- a/Documentation/devicetree/bindings/usb/usbmisc-imx.txt +++ b/Documentation/devicetree/bindings/usb/usbmisc-imx.txt @@ -4,6 +4,7 @@ Required properties: - #index-cells: Cells used to descibe usb controller index. Should be <1> - compatible: Should be one of below: "fsl,imx6q-usbmisc" for imx6q + "fsl,vf610-usbmisc" for Vybrid vf610 - reg: Should contain registers location and length Examples: |