Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

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

diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 46e2da3..60f3327 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -17,6 +17,13 @@
        #address-cells = <1>;
        #size-cells = <1>;
 
+       aliases {
+               ethernet0 = &eth0;
+               ethernet1 = &eth1;
+               serial0 = &scc1;
+               serial1 = &scc4;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -46,13 +53,13 @@
                #size-cells = <1>;
                reg = <0xf0010100 0x40>;
 
-               ranges = <0x0 0x0 0xfe000000 0x2000000
+               ranges = <0x0 0x0 0xff800000 0x00800000
                          0x1 0x0 0xf4500000 0x8000
                          0x3 0x0 0xf8200000 0x8000>;
 
                flash@0,0 {
                        compatible = "jedec-flash";
-                       reg = <0x0 0x0 0x2000000>;
+                       reg = <0x0 0x0 0x00800000>;
                        bank-width = <4>;
                        device-width = <1>;
                };
@@ -144,7 +151,7 @@
                                reg = <0x119f0 0x10 0x115f0 0x10>;
                        };
 
-                       serial@11a00 {
+                       scc1: serial@11a00 {
                                device_type = "serial";
                                compatible = "fsl,mpc8272-scc-uart",
                                             "fsl,cpm2-scc-uart";
@@ -155,7 +162,7 @@
                                fsl,cpm-command = <0x800000>;
                        };
 
-                       serial@11a60 {
+                       scc4: serial@11a60 {
                                device_type = "serial";
                                compatible = "fsl,mpc8272-scc-uart",
                                             "fsl,cpm2-scc-uart";
@@ -192,7 +199,7 @@
                                };
                        };
 
-                       ethernet@11300 {
+                       eth0: ethernet@11300 {
                                device_type = "network";
                                compatible = "fsl,mpc8272-fcc-enet",
                                             "fsl,cpm2-fcc-enet";
@@ -205,7 +212,7 @@
                                fsl,cpm-command = <0x12000300>;
                        };
 
-                       ethernet@11320 {
+                       eth1: ethernet@11320 {
                                device_type = "network";
                                compatible = "fsl,mpc8272-fcc-enet",
                                             "fsl,cpm2-fcc-enet";
@@ -217,6 +224,17 @@
                                linux,network-index = <1>;
                                fsl,cpm-command = <0x16200300>;
                        };
+
+                       i2c@11860 {
+                               compatible = "fsl,mpc8272-i2c",
+                                            "fsl,cpm2-i2c";
+                               reg = <0x11860 0x20 0x8afc 0x2>;
+                               interrupts = <1 8>;
+                               interrupt-parent = <&PIC>;
+                               fsl,cpm-command = <0x29600000>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                       };
                };
 
                PIC: interrupt-controller@10c00 {
@@ -226,22 +244,15 @@
                        compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
                };
 
-/* May need to remove if on a part without crypto engine */
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "fsl,mpc8272-talitos-sec2",
-                                    "fsl,talitos-sec2",
-                                    "fsl,talitos",
-                                    "talitos";
-                       reg = <0x30000 0x10000>;
-                       interrupts = <11 8>;
+                       compatible = "fsl,sec1.0";
+                       reg = <0x40000 0x13000>;
+                       interrupts = <47 0x8>;
                        interrupt-parent = <&PIC>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x7e>;
-/* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                       descriptor-types-mask = <0x1010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x1010415>;
                };
        };