diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 11:41:36 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-07-24 11:41:36 +0000 |
| commit | 5abe65e3d67aac9f9b5c08660f817a2d6ec5515f (patch) | |
| tree | 7422d99151ab4967a4b0f1783a156e6a1527ccde /Documentation | |
| parent | ba364fc752daeded072a5ef31e43b84cb1f9e5fd (diff) | |
| parent | a728b977429383b3fe92b6e3bff9e69365609e0f (diff) | |
Merge branch 'mvebu/fixes' into mvebu/soc-cpuidle
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/armada-38x.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/armada-38x.txt b/Documentation/devicetree/bindings/arm/armada-38x.txt index 11f2330a655..ad9f8ed4d9b 100644 --- a/Documentation/devicetree/bindings/arm/armada-38x.txt +++ b/Documentation/devicetree/bindings/arm/armada-38x.txt @@ -6,5 +6,15 @@ following property: Required root node property: - - compatible: must contain either "marvell,armada380" or - "marvell,armada385" depending on the variant of the SoC being used. + - compatible: must contain "marvell,armada380" + +In addition, boards using the Marvell Armada 385 SoC shall have the +following property before the previous one: + +Required root node property: + +compatible: must contain "marvell,armada385" + +Example: + +compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380"; |