Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / arch / powerpc / boot / dts / mpc832x_mds.dts

diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index b5968b6..fbc9304 100644 (file)
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -68,6 +68,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <132000000>;
@@ -150,17 +151,14 @@
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <0x30000 0x7000>;
+                       compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 2.2 */
-                       num-channels = <1>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x0000004c>;
-                       descriptor-types-mask = <0x0122003f>;
+                       fsl,num-channels = <1>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x4c>;
+                       fsl,descriptor-types-mask = <0x0122003f>;
                };
 
                ipic: pic@700 {