diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-09-16 18:53:59 +0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-09-16 18:53:59 +0400 |
| commit | 4cd41ffd27b6b775445ecfdb72b592b71d6b4a32 (patch) | |
| tree | 61e8c51ed5b9fae163d2d54967ebda02805c0bfa /Documentation/devicetree/bindings/usb/mxs-phy.txt | |
| parent | d9152161b4bfd131a8253a5b9fcd8ba9b10277c4 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | linux-4cd41ffd27b6b775445ecfdb72b592b71d6b4a32.tar.xz | |
Merge tag 'v3.17-rc5' into next
Linux 3.17-rc5
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'Documentation/devicetree/bindings/usb/mxs-phy.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/usb/mxs-phy.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/usb/mxs-phy.txt index fe3eed89e4c3..379b84a567cc 100644 --- a/Documentation/devicetree/bindings/usb/mxs-phy.txt +++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt @@ -6,6 +6,7 @@ Required properties: * "fsl,imx6q-usbphy" for imx6dq and imx6dl * "fsl,imx6sl-usbphy" for imx6sl * "fsl,vf610-usbphy" for Vybrid vf610 + * "fsl,imx6sx-usbphy" for imx6sx "fsl,imx23-usbphy" is still a fallback for other strings - reg: Should contain registers location and length - interrupts: Should contain phy interrupt |