Merge tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu/dt #2" from Andrew Lunn:

Second set of dt patches for mvebu for v3.20.

* tag 'mvebu-dt-3.20-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: make DTS comments reflect DEBUG_LL changes
  ARM: mvebu: Armada 385 GP: Add regulators to the SATA port
  ARM: Kirkwood: Added support for pogoplug e02 (pink/gray)
  ARM: mvebu: fix compatible strings of MBus on Armada 375 and Armada 38x
  dt: bindings: update mvebu-mbus DT binding with new compatible properties

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 3 insertions, 2 deletions

diff --git a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
index 5e16c3ccb061..fa6cde41b460 100644
--- a/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
+++ b/Documentation/devicetree/bindings/bus/mvebu-mbus.txt
@@ -6,8 +6,8 @@ Required properties:
 - compatible:    Should be set to one of the following:
                  marvell,armada370-mbus
                  marvell,armadaxp-mbus
-                 marvell,armada370-mbus
-                 marvell,armadaxp-mbus
+                 marvell,armada375-mbus
+                 marvell,armada380-mbus
                  marvell,kirkwood-mbus
                  marvell,dove-mbus
                  marvell,orion5x-88f5281-mbus
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 76a4b3b43e59..74187660619b 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -35,6 +35,7 @@ chipidea	Chipidea, Inc
 chrp    Common Hardware Reference Platform
 chunghwa        Chunghwa Picture Tubes Ltd.
 cirrus  Cirrus Logic, Inc.
+cloudengines    Cloud Engines, Inc.
 cnm     Chips&Media, Inc.
 cortina Cortina Systems, Inc.
 crystalfontz    Crystalfontz America, Inc.