diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 16:16:09 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 16:16:09 -0400 |
commit | b903bd69e3fa156598def8d6433dfe5352af8da3 (patch) | |
tree | a13380f31bab62acfd667910656525c09511cb8a /Documentation/devicetree | |
parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
parent | 1a49e2ac9651df7349867a5cf44e2c83de1046af (diff) |
Merge 3.5-rc7 into usb-next
This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/usb/ci13xxx-imx.txt | 18 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/usb/mxs-phy.txt | 13 |
2 files changed, 31 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt new file mode 100644 index 000000000000..2c290418bb2d --- /dev/null +++ b/Documentation/devicetree/bindings/usb/ci13xxx-imx.txt | |||
@@ -0,0 +1,18 @@ | |||
1 | * Freescale i.MX ci13xxx usb controllers | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: Should be "fsl,imx27-usb" | ||
5 | - reg: Should contain registers location and length | ||
6 | - interrupts: Should contain controller interrupt | ||
7 | |||
8 | Optional properties: | ||
9 | - fsl,usbphy: phandler of usb phy that connects to the only one port | ||
10 | - vbus-supply: regulator for vbus | ||
11 | |||
12 | Examples: | ||
13 | usb@02184000 { /* USB OTG */ | ||
14 | compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; | ||
15 | reg = <0x02184000 0x200>; | ||
16 | interrupts = <0 43 0x04>; | ||
17 | fsl,usbphy = <&usbphy1>; | ||
18 | }; | ||
diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/usb/mxs-phy.txt new file mode 100644 index 000000000000..5835b27146ea --- /dev/null +++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt | |||
@@ -0,0 +1,13 @@ | |||
1 | * Freescale MXS USB Phy Device | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: Should be "fsl,imx23-usbphy" | ||
5 | - reg: Should contain registers location and length | ||
6 | - interrupts: Should contain phy interrupt | ||
7 | |||
8 | Example: | ||
9 | usbphy1: usbphy@020c9000 { | ||
10 | compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; | ||
11 | reg = <0x020c9000 0x1000>; | ||
12 | interrupts = <0 44 0x04>; | ||
13 | }; | ||