Merge commit 'v2.6.32-rc7'
[safe/jmp/linux-2.6] / arch / powerpc / boot / dts / mpc8569mds.dts
index e16a5d4..1e3ec8f 100644 (file)
                ethernet1 = &enet1;
                ethernet2 = &enet2;
                ethernet3 = &enet3;
+               ethernet5 = &enet5;
+               ethernet7 = &enet7;
                pci1 = &pci1;
+               rapidio0 = &rio0;
        };
 
        cpus {
                #address-cells = <2>;
                #size-cells = <1>;
                compatible = "fsl,mpc8569-elbc", "fsl,elbc", "simple-bus";
-               reg = <0 0xe0005000 0 0x1000>;
-               interrupt = <19 2>;
+               reg = <0xe0005000 0x1000>;
+               interrupts = <19 2>;
                interrupt-parent = <&mpic>;
 
                ranges = <0x0 0x0 0xfe000000 0x02000000
                          0x1 0x0 0xf8000000 0x00008000
                          0x2 0x0 0xf0000000 0x04000000
+                         0x3 0x0 0xfc000000 0x00008000
                          0x4 0x0 0xf8008000 0x00008000
                          0x5 0x0 0xf8010000 0x00008000>;
 
                        #size-cells = <1>;
                        compatible = "cfi-flash";
                        reg = <0x0 0x0 0x02000000>;
-                       bank-width = <2>;
+                       bank-width = <1>;
                        device-width = <1>;
+                       partition@0 {
+                               label = "ramdisk";
+                               reg = <0x00000000 0x01c00000>;
+                       };
+                       partition@1c00000 {
+                               label = "kernel";
+                               reg = <0x01c00000 0x002e0000>;
+                       };
+                       partiton@1ee0000 {
+                               label = "dtb";
+                               reg = <0x01ee0000 0x00020000>;
+                       };
+                       partition@1f00000 {
+                               label = "firmware";
+                               reg = <0x01f00000 0x00080000>;
+                               read-only;
+                       };
+                       partition@1f80000 {
+                               label = "u-boot";
+                               reg = <0x01f80000 0x00080000>;
+                               read-only;
+                       };
                };
 
                bcsr@1,0 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        compatible = "fsl,mpc8569mds-bcsr";
                        reg = <1 0 0x8000>;
+                       ranges = <0 1 0 0x8000>;
+
+                       bcsr17: gpio-controller@11 {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mpc8569mds-bcsr-gpio";
+                               reg = <0x11 0x1>;
+                               gpio-controller;
+                       };
+               };
+
+               nand@3,0 {
+                       compatible = "fsl,mpc8569-fcm-nand",
+                                    "fsl,elbc-fcm-nand";
+                       reg = <3 0 0x8000>;
                };
 
                pib@4,0 {
                device_type = "soc";
                compatible = "fsl,mpc8569-immr", "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
-               reg = <0xe0000000 0x1000>;
                bus-frequency = <0>;
 
                ecm-law@0 {
                        };
                };
 
+               sdhci@2e000 {
+                       compatible = "fsl,mpc8569-esdhc", "fsl,esdhc";
+                       reg = <0x2e000 0x1000>;
+                       interrupts = <72 0x8>;
+                       interrupt-parent = <&mpic>;
+                       /* Filled in by U-Boot */
+                       clock-frequency = <0>;
+                       status = "disabled";
+                       sdhci,1-bit-only;
+               };
+
                crypto@30000 {
                        compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4",
                                "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
                        interrupt-parent = <&mpic>;
                        fsl,num-channels = <4>;
                        fsl,channel-fifo-len = <24>;
-                       fsl,exec-units-mask = <0x9fe>;
+                       fsl,exec-units-mask = <0xbfe>;
                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                };
 
                        device_type = "open-pic";
                };
 
+               msi@41600 {
+                       compatible = "fsl,mpc8568-msi", "fsl,mpic-msi";
+                       reg = <0x41600 0x80>;
+                       msi-available-ranges = <0 0x100>;
+                       interrupts = <
+                               0xe0 0
+                               0xe1 0
+                               0xe2 0
+                               0xe3 0
+                               0xe4 0
+                               0xe5 0
+                               0xe6 0
+                               0xe7 0>;
+                       interrupt-parent = <&mpic>;
+               };
+
                global-utilities@e0000 {
                        compatible = "fsl,mpc8569-guts";
                        reg = <0xe0000 0x1000>;
                };
 
                par_io@e0100 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
                        reg = <0xe0100 0x100>;
+                       ranges = <0x0 0xe0100 0x100>;
                        device_type = "par_io";
                        num-ports = <7>;
 
+                       qe_pio_e: gpio-controller@80 {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mpc8569-qe-pario-bank",
+                                            "fsl,mpc8323-qe-pario-bank";
+                               reg = <0x80 0x18>;
+                               gpio-controller;
+                       };
+
+                       qe_pio_f: gpio-controller@a0 {
+                               #gpio-cells = <2>;
+                               compatible = "fsl,mpc8569-qe-pario-bank",
+                                            "fsl,mpc8323-qe-pario-bank";
+                               reg = <0xa0 0x18>;
+                               gpio-controller;
+                       };
+
                        pio1: ucc_pin@01 {
                                pio-map = <
                        /* port  pin  dir  open_drain  assignment  has_irq */
                        interrupt-parent = <&mpic>;
                };
 
+               timer@440 {
+                       compatible = "fsl,mpc8569-qe-gtm",
+                                    "fsl,qe-gtm", "fsl,gtm";
+                       reg = <0x440 0x40>;
+                       interrupts = <12 13 14 15>;
+                       interrupt-parent = <&qeic>;
+                       /* Filled in by U-Boot */
+                       clock-frequency = <0>;
+               };
+
                spi@4c0 {
-                       cell-index = <0>;
-                       compatible = "fsl,spi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "fsl,mpc8569-qe-spi", "fsl,spi";
                        reg = <0x4c0 0x40>;
+                       cell-index = <0>;
                        interrupts = <2>;
                        interrupt-parent = <&qeic>;
-                       mode = "cpu";
+                       gpios = <&qe_pio_e 30 0>;
+                       mode = "cpu-qe";
+
+                       serial-flash@0 {
+                               compatible = "stm,m25p40";
+                               reg = <0>;
+                               spi-max-frequency = <25000000>;
+                       };
                };
 
                spi@500 {
                        mode = "cpu";
                };
 
+               usb@6c0 {
+                       compatible = "fsl,mpc8569-qe-usb",
+                                    "fsl,mpc8323-qe-usb";
+                       reg = <0x6c0 0x40 0x8b00 0x100>;
+                       interrupts = <11>;
+                       interrupt-parent = <&qeic>;
+                       fsl,fullspeed-clock = "clk5";
+                       fsl,lowspeed-clock = "brg10";
+                       gpios = <&qe_pio_f 3 0   /* USBOE */
+                                &qe_pio_f 4 0   /* USBTP */
+                                &qe_pio_f 5 0   /* USBTN */
+                                &qe_pio_f 6 0   /* USBRP */
+                                &qe_pio_f 8 0   /* USBRN */
+                                &bcsr17   1 0   /* SPEED */
+                                &bcsr17   2 0>; /* POWER */
+               };
+
                enet0: ucc@2000 {
                        device_type = "network";
                        compatible = "ucc_geth";
                                reg = <0x3>;
                                device_type = "ethernet-phy";
                        };
+                       qe_phy5: ethernet-phy@04 {
+                               interrupt-parent = <&mpic>;
+                               reg = <0x04>;
+                               device_type = "ethernet-phy";
+                       };
+                       qe_phy7: ethernet-phy@06 {
+                               interrupt-parent = <&mpic>;
+                               reg = <0x6>;
+                               device_type = "ethernet-phy";
+                       };
+                       tbi-phy@11 {
+                               reg = <0x11>;
+                               device_type = "tbi-phy";
+                       };
+               };
+               mdio@3520 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x3520 0x18>;
+                       compatible = "fsl,ucc-mdio";
+
+                       tbi0: tbi-phy@15 {
+                       reg = <0x15>;
+                       device_type = "tbi-phy";
+                       };
+               };
+               mdio@3720 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x3720 0x38>;
+                       compatible = "fsl,ucc-mdio";
+                       tbi1: tbi-phy@17 {
+                               reg = <0x17>;
+                               device_type = "tbi-phy";
+                       };
                };
 
                enet2: ucc@2200 {
                        phy-connection-type = "rgmii-id";
                };
 
+               enet5: ucc@3400 {
+                       device_type = "network";
+                       compatible = "ucc_geth";
+                       cell-index = <6>;
+                       reg = <0x3400 0x200>;
+                       interrupts = <41>;
+                       interrupt-parent = <&qeic>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       rx-clock-name = "none";
+                       tx-clock-name = "none";
+                       tbi-handle = <&tbi0>;
+                       phy-handle = <&qe_phy5>;
+                       phy-connection-type = "sgmii";
+               };
+
+               enet7: ucc@3600 {
+                       device_type = "network";
+                       compatible = "ucc_geth";
+                       cell-index = <8>;
+                       reg = <0x3600 0x200>;
+                       interrupts = <43>;
+                       interrupt-parent = <&qeic>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       rx-clock-name = "none";
+                       tx-clock-name = "none";
+                       tbi-handle = <&tbi1>;
+                       phy-handle = <&qe_phy7>;
+                       phy-connection-type = "sgmii";
+               };
+
                muram@10000 {
                        #address-cells = <1>;
                        #size-cells = <1>;
                                  0x0 0x800000>;
                };
        };
+
+       rio0: rapidio@e00c00000 {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta";
+               reg = <0xe00c0000 0x20000>;
+               ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>;
+               interrupts = <48 2 /* error     */
+                             49 2 /* bell_outb */
+                             50 2 /* bell_inb  */
+                             53 2 /* msg1_tx   */
+                             54 2 /* msg1_rx   */
+                             55 2 /* msg2_tx   */
+                             56 2 /* msg2_rx   */>;
+               interrupt-parent = <&mpic>;
+       };
 };