Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / Documentation / devicetree / bindings / i2c / i2c-mv64xxx.txt

diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
index 6113f9275f42074d044199145b37d20feddf279e..82e8f6f17179b9b951e3d14f17d5a8b1671990ec 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt
@@ -5,6 +5,7 @@ Required properties :
 
  - reg             : Offset and length of the register set for the device
  - compatible      : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c"
+                     or "marvell,mv78230-i2c"
  - interrupts      : The interrupt number
 
 Optional properties :
@@ -20,3 +21,12 @@ Examples:
                interrupts = <29>;
                clock-frequency = <100000>;
        };
+
+For the Armada XP:
+
+       i2c@11000 {
+               compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";
+               reg = <0x11000 0x100>;
+               interrupts = <29>;
+               clock-frequency = <100000>;
+       };