Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 9d636e3..e4d7030 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -199,12 +199,6 @@
                                reg = <0x2>;
                                device_type = "ethernet-phy";
                        };
-                       phy3: ethernet-phy@3 {
-                               interrupt-parent = <&ipic>;
-                               interrupts = <18 0x8>;
-                               reg = <0x3>;
-                               device_type = "ethernet-phy";
-                       };
                };
 
                enet0: ethernet@24000 {
@@ -230,7 +224,7 @@
                        interrupts = <35 0x8 36 0x8 37 0x8>;
                        phy-connection-type = "mii";
                        interrupt-parent = <&ipic>;
-                       phy-handle = <&phy3>;
+                       fixed-link = <1 1 1000 0 0>;
                };
 
                serial0: serial@4500 {
@@ -254,17 +248,15 @@
                };
 
                crypto@30000 {
-                       model = "SEC3";
-                       device_type = "crypto";
-                       compatible = "talitos";
+                       compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                    "fsl,sec2.1", "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
                        interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       /* Rev. 3.0 geometry */
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x000001fe>;
-                       descriptor-types-mask = <0x03ab0ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                sata@18000 {