Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6

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

diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
index e42a2ee233e65160f85840a74814a16774a714db..7fd7fa25e9b0f084cec79cd6a5a4c24e1a75fa77 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-designware.txt
@@ -10,6 +10,10 @@ Recommended properties :
 
  - clock-frequency : desired I2C bus clock frequency in Hz.
 
+Optional properties :
+ - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds.
+   This option is only supported in hardware blocks version 1.11a or newer.
+
 Example :
 
        i2c@f0000 {
@@ -20,3 +24,14 @@ Example :
                interrupts = <11>;
                clock-frequency = <400000>;
        };
+
+       i2c@1120000 {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               compatible = "snps,designware-i2c";
+               reg = <0x1120000 0x1000>;
+               interrupt-parent = <&ictl>;
+               interrupts = <12 1>;
+               clock-frequency = <400000>;
+               i2c-sda-hold-time-ns = <300>;
+       };