[POWERPC] 4xx: Remove "i2c" and "xxmii-interface" device_types from dts

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

diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index bdd56b0e94603a001005e7e0d81a0770182dc5b1..7dc37c9a7446b28d58af7a1d5134bfb43f89b21f 100644 (file)
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -16,14 +16,24 @@
        #size-cells = <1>;
        model = "amcc,bamboo";
        compatible = "amcc,bamboo";
-       dcr-parent = <&/cpus/PowerPC,440EP@0>;
+       dcr-parent = <&/cpus/cpu@0>;
+
+       aliases {
+               ethernet0 = &EMAC0;
+               ethernet1 = &EMAC1;
+               serial0 = &UART0;
+               serial1 = &UART1;
+               serial2 = &UART2;
+               serial3 = &UART3;
+       };
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440EP@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440EP";
                        reg = <0>;
                        clock-frequency = <0>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */
@@ -94,15 +104,17 @@
                        compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
                        dcr-reg = <180 62>;
                        num-tx-chans = <4>;
-                       num-rx-chans = <4>;
+                       num-rx-chans = <2>;
                        interrupt-parent = <&MAL0>;
                        interrupts = <0 1 2 3 4>;
                        #interrupt-cells = <1>;
+                       #address-cells = <0>;
+                       #size-cells = <0>;
                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
                                        /*RXEOB*/ 1 &UIC0 b 4
                                        /*SERR*/  2 &UIC1 0 4
                                        /*TXDE*/  3 &UIC1 1 4
-                                       /*RXDE*/  4 &UIC1 3 4>;
+                                       /*RXDE*/  4 &UIC1 2 4>;
                };
 
                POB0: opb {
@@ -124,7 +136,6 @@
                                #address-cells = <2>;
                                #size-cells = <1>;
                                clock-frequency = <0>; /* Filled in by zImage */
-                               ranges;
                                interrupts = <5 1>;
                                interrupt-parent = <&UIC1>;
                        };
@@ -174,7 +185,6 @@
                        };
 
                        IIC0: i2c@ef600700 {
-                               device_type = "i2c";
                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
                                reg = <ef600700 14>;
                                interrupt-parent = <&UIC0>;
@@ -182,7 +192,6 @@
                        };
 
                        IIC1: i2c@ef600800 {
-                               device_type = "i2c";
                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
                                reg = <ef600800 14>;
                                interrupt-parent = <&UIC0>;
@@ -190,12 +199,12 @@
                        };
 
                        ZMII0: emac-zmii@ef600d00 {
-                               device_type = "zmii-interface";
                                compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
                                reg = <ef600d00 c>;
                        };
 
                        EMAC0: ethernet@ef600e00 {
+                               linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
@@ -210,12 +219,13 @@
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rmii";
-                               phy-map = <00000001>;
+                               phy-map = <00000000>;
                                zmii-device = <&ZMII0>;
                                zmii-channel = <0>;
                        };
 
                        EMAC1: ethernet@ef600f00 {
+                               linux,network-index = <1>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
@@ -230,15 +240,60 @@
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rmii";
-                               phy-map = <00000001>;
+                               phy-map = <00000000>;
                                zmii-device = <&ZMII0>;
                                zmii-channel = <1>;
                        };
+
+                       usb@ef601000 {
+                               compatible = "ohci-be";
+                               reg = <ef601000 80>;
+                               interrupts = <8 1 9 1>;
+                               interrupt-parent = < &UIC1 >;
+                       };
+               };
+
+               PCI0: pci@ec000000 {
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       #size-cells = <2>;
+                       #address-cells = <3>;
+                       compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
+                       primary;
+                       reg = <0 eec00000 8     /* Config space access */
+                              0 eed00000 4     /* IACK */
+                              0 eed00000 4     /* Special cycle */
+                              0 ef400000 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 a0000000 0 a0000000 0 20000000
+                                 01000000 0 00000000 0 e8000000 0 00010000>;
+
+                       /* Inbound 2GB range starting at 0 */
+                       dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                       /* Bamboo 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 1b 8
+
+                               /* IDSEL 3 */
+                               1800 0 0 0 &UIC0 1a 8
+
+                               /* IDSEL 4 */
+                               2000 0 0 0 &UIC0 19 8
+                       >;
                };
        };
 
        chosen {
                linux,stdout-path = "/plb/opb/serial@ef600300";
-               bootargs = "console=ttyS0,115200";
        };
 };