Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index 754fa3960f8331813aede79d855bf57bbf49730c..a328607c8f84d40389776088bc830a27d933498e 100644 (file)
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -14,14 +14,21 @@
        #size-cells = <1>;
        model = "ibm,walnut";
        compatible = "ibm,walnut";
-       dcr-parent = <&/cpus/PowerPC,405GP@0>;
+       dcr-parent = <&/cpus/cpu@0>;
+
+       aliases {
+               ethernet0 = &EMAC;
+               serial0 = &UART0;
+               serial1 = &UART1;
+       };
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,405GP@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,405GP";
                        reg = <0>;
                        clock-frequency = <bebc200>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */
@@ -118,7 +125,6 @@
                        };
 
                        EMAC: ethernet@ef600800 {
-                               linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-405gp", "ibm,emac";
                                interrupt-parent = <&UIC0>;
@@ -168,9 +174,10 @@
                                };
                        };
 
-                       ds1743@1,0 {
+                       nvram@1,0 {
                                /* NVRAM and RTC */
-                               compatible = "ds1743";
+                               compatible = "ds1743-nvram";
+                               #bytes = <2000>;
                                reg = <1 0 2000>;
                        };
 
@@ -190,6 +197,45 @@
                                virtual-reg = <f0300005>;
                        };
                };
+
+               PCI0: pci@ec000000 {
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       #size-cells = <2>;
+                       #address-cells = <3>;
+                       compatible = "ibm,plb405gp-pci", "ibm,plb-pci";
+                       primary;
+                       reg = <eec00000 8       /* Config space access */
+                              eed80000 4       /* IACK */
+                              eed80000 4       /* Special cycle */
+                              ef480000 40>;    /* Internal registers */
+
+                       /* Outbound ranges, one memory and one IO,
+                        * later cannot be changed. Chip supports a second
+                        * IO range but we don't use it for now
+                        */
+                       ranges = <02000000 0 80000000 80000000 0 20000000
+                                 01000000 0 00000000 e8000000 0 00010000>;
+
+                       /* Inbound 2GB range starting at 0 */
+                       dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                       /* Walnut has all 4 IRQ pins tied together per slot */
+                       interrupt-map-mask = <f800 0 0 0>;
+                       interrupt-map = <
+                               /* IDSEL 1 */
+                               0800 0 0 0 &UIC0 1c 8
+
+                               /* IDSEL 2 */
+                               1000 0 0 0 &UIC0 1d 8
+
+                               /* IDSEL 3 */
+                               1800 0 0 0 &UIC0 1e 8
+
+                               /* IDSEL 4 */
+                               2000 0 0 0 &UIC0 1f 8
+                       >;
+               };
        };
 
        chosen {