aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/ata
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-27 08:25:20 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-27 08:25:20 -0800
commit842f57baab186417d89810f3dd6147f1ef3009dd (patch)
tree63150a49c6ce3ba28d5a98abbab780b4fe8022dc /Documentation/devicetree/bindings/ata
parentUSB: adutux: NULL dereferences on disconnect (diff)
parentphy: add support for USB cluster on the Armada 375 SoC (diff)
downloadlinux-dev-842f57baab186417d89810f3dd6147f1ef3009dd.tar.xz
linux-dev-842f57baab186417d89810f3dd6147f1ef3009dd.zip
Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing
Kishon writes: Improvements in phy-core specifically on PHY core finds the PHY in the case of non-dt boot. Adds three new PHY drivers using the PHY framework and some miscellaneous fixes and cleanups.
Diffstat (limited to 'Documentation/devicetree/bindings/ata')
-rw-r--r--Documentation/devicetree/bindings/ata/marvell.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt
index 1c8351604d38..b460edd12766 100644
--- a/Documentation/devicetree/bindings/ata/marvell.txt
+++ b/Documentation/devicetree/bindings/ata/marvell.txt
@@ -6,11 +6,17 @@ Required Properties:
- interrupts : Interrupt controller is using
- nr-ports : Number of SATA ports in use.
+Optional Properties:
+- phys : List of phandles to sata phys
+- phy-names : Should be "0", "1", etc, one number per phandle
+
Example:
sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
+ phys = <&sata_phy0>, <&sata_phy1>;
+ phy-names = "0", "1";
nr-ports = <2>;
}