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

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

diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index f8790c4747dfd9a63c8d7e25ceff5d6b2556f863..0b000cb7ed8b3983fe1e2e659210c8b54f3b7ed4 100644 (file)
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -158,9 +158,10 @@
                                        };
                                };
 
-                               ds1743@1,0 {
+                               nvram@1,0 {
                                        /* NVRAM & RTC */
-                                       compatible = "ds1743";
+                                       compatible = "ds1743-nvram";
+                                       #bytes = <2000>;
                                        reg = <1 0 2000>;
                                };
 
@@ -215,7 +216,6 @@
 
                        IIC0: i2c@40000400 {
                                /* FIXME */
-                               device_type = "i2c";
                                compatible = "ibm,iic-440gp", "ibm,iic";
                                reg = <40000400 14>;
                                interrupt-parent = <&UIC0>;
@@ -223,7 +223,6 @@
                        };
                        IIC1: i2c@40000500 {
                                /* FIXME */
-                               device_type = "i2c";
                                compatible = "ibm,iic-440gp", "ibm,iic";
                                reg = <40000500 14>;
                                interrupt-parent = <&UIC0>;