Merge remote branch 'kumar/next' into merge

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

diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts
index 6aa1d69..eab680c 100644 (file)
--- a/arch/powerpc/boot/dts/storcenter.dts
+++ b/arch/powerpc/boot/dts/storcenter.dts
@@ -11,9 +11,11 @@
  * warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
        model = "StorCenter";
-       compatible = "storcenter";
+       compatible = "iomega,storcenter";
        #address-cells = <1>;
        #size-cells = <1>;
 
@@ -30,19 +32,19 @@
                PowerPC,8241@0 {
                        device_type = "cpu";
                        reg = <0>;
-                       clock-frequency = <d# 200000000>;       /* Hz */
-                       timebase-frequency = <d# 25000000>;     /* Hz */
+                       clock-frequency = <200000000>;
+                       timebase-frequency = <25000000>;
                        bus-frequency = <0>;    /* from bootwrapper */
-                       i-cache-line-size = <d# 32>;    /* bytes */
-                       d-cache-line-size = <d# 32>;    /* bytes */
-                       i-cache-size = <4000>;
-                       d-cache-size = <4000>;
+                       i-cache-line-size = <32>;
+                       d-cache-line-size = <32>;
+                       i-cache-size = <16384>;
+                       d-cache-size = <16384>;
                };
        };
 
        memory {
                device_type = "memory";
-               reg = <00000000 04000000>;      /* 64MB @ 0x0 */
+               reg = <0x00000000 0x04000000>;  /* 64MB @ 0x0 */
        };
 
        soc@fc000000 {
@@ -51,21 +53,21 @@
                device_type = "soc";
                compatible = "fsl,mpc8241", "mpc10x";
                store-gathering = <0>; /* 0 == off, !0 == on */
-               ranges = <0 fc000000 100000>;
-               reg = <fc000000 100000>;        /* EUMB */
+               ranges = <0x0 0xfc000000 0x100000>;
+               reg = <0xfc000000 0x100000>;    /* EUMB */
                bus-frequency = <0>;            /* fixed by loader */
 
                i2c@3000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        compatible = "fsl-i2c";
-                       reg = <3000 100>;
-                       interrupts = <5 2>;
+                       reg = <0x3000 0x100>;
+                       interrupts = <17 2>;
                        interrupt-parent = <&mpic>;
 
                        rtc@68 {
                                compatible = "dallas,ds1337";
-                               reg = <68>;
+                               reg = <0x68>;
                        };
                };
 
@@ -73,10 +75,10 @@
                        cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <4500 20>;
-                       clock-frequency = <d# 97553800>; /* Hz */
-                       current-speed = <d# 115200>;
-                       interrupts = <9 2>;
+                       reg = <0x4500 0x20>;
+                       clock-frequency = <97553800>; /* Hz */
+                       current-speed = <115200>;
+                       interrupts = <25 2>;
                        interrupt-parent = <&mpic>;
                };
 
@@ -84,19 +86,20 @@
                        cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <4600 20>;
-                       clock-frequency = <d# 97553800>; /* Hz */
-                       current-speed = <d# 9600>;
-                       interrupts = <a 2>;
+                       reg = <0x4600 0x20>;
+                       clock-frequency = <97553800>; /* Hz */
+                       current-speed = <9600>;
+                       interrupts = <26 2>;
                        interrupt-parent = <&mpic>;
                };
 
                mpic: interrupt-controller@40000 {
                        #interrupt-cells = <2>;
+                       #address-cells = <0>;
                        device_type = "open-pic";
                        compatible = "chrp,open-pic";
                        interrupt-controller;
-                       reg = <40000 40000>;
+                       reg = <0x40000 0x40000>;
                };
 
        };
@@ -107,32 +110,33 @@
                #interrupt-cells = <1>;
                device_type = "pci";
                compatible = "mpc10x-pci";
-               reg = <fe800000 1000>;
-               ranges = <01000000 0        0 fe000000 0 00c00000
-                         02000000 0 80000000 80000000 0 70000000>;
-               bus-range = <0 ff>;
-               clock-frequency = <d# 97553800>; /* Hz */
+               reg = <0xfe800000 0x1000>;
+               ranges = <0x01000000 0x0        0x0 0xfe000000 0x0 0x00c00000
+                         0x02000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
+               bus-range = <0 0xff>;
+               clock-frequency = <97553800>;
                interrupt-parent = <&mpic>;
-               interrupt-map-mask = <f800 0 0 7>;
+               interrupt-map-mask = <0xf800 0 0 7>;
                interrupt-map = <
                        /* IDSEL 13 - IDE */
-                       6800 0 0 1 &mpic 0 1
-                       6800 0 0 2 &mpic 0 1
-                       6800 0 0 3 &mpic 0 1
+                       0x6800 0 0 1 &mpic 0 1
+                       0x6800 0 0 2 &mpic 0 1
+                       0x6800 0 0 3 &mpic 0 1
+                       0x6800 0 0 4 &mpic 0 1
                        /* IDSEL 14 - USB */
-                       7000 0 0 1 &mpic 0 1
-                       7000 0 0 2 &mpic 0 1
-                       7000 0 0 3 &mpic 0 1
-                       7000 0 0 4 &mpic 0 1
+                       0x7000 0 0 1 &mpic 0 1
+                       0x7000 0 0 2 &mpic 0 1
+                       0x7000 0 0 3 &mpic 0 1
+                       0x7000 0 0 4 &mpic 0 1
                        /* IDSEL 15 - ETH */
-                       7800 0 0 1 &mpic 0 1
-                       7800 0 0 2 &mpic 0 1
-                       7800 0 0 3 &mpic 0 1
-                       7800 0 0 4 &mpic 0 1
+                       0x7800 0 0 1 &mpic 0 1
+                       0x7800 0 0 2 &mpic 0 1
+                       0x7800 0 0 3 &mpic 0 1
+                       0x7800 0 0 4 &mpic 0 1
                >;
        };
 
        chosen {
-               linux,stdout-path = "/soc/serial@4500";
+               linux,stdout-path = &serial0;
        };
 };