Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / arch / powerpc / boot / dts / mpc866ads.dts

diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index 765e43c997da1458b6aae6ea1216b59e57aff390..bd700651f360d220e4b7d85c2261532f5095f68c 100644 (file)
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -171,6 +171,17 @@
                                fsl,cpm-command = <0000>;
                                linux,network-index = <1>;
                        };
+
+                       i2c@860 {
+                               compatible = "fsl,mpc866-i2c",
+                                            "fsl,cpm1-i2c";
+                               reg = <0x860 0x20 0x3c80 0x30>;
+                               interrupts = <16>;
+                               interrupt-parent = <&CPM_PIC>;
+                               fsl,cpm-command = <0x10>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
                };
        };