Merge branch 'linus' into x86/x2apic
[sfrench/cifs-2.6.git] / arch / powerpc / boot / dts / mpc8349emitx.dts
index 44c065a6b5e71a2ea1fe318a5062a2d8d79f3ff8..8dfab56625856ea3d57f77b45921789b5d22a206 100644 (file)
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  */
+
+/dts-v1/;
+
 / {
        model = "MPC8349EMITX";
        compatible = "MPC8349EMITX", "MPC834xMITX", "MPC83xxMITX";
        #address-cells = <1>;
        #size-cells = <1>;
 
+       aliases {
+               ethernet0 = &enet0;
+               ethernet1 = &enet1;
+               serial0 = &serial0;
+               serial1 = &serial1;
+               pci0 = &pci0;
+               pci1 = &pci1;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
                PowerPC,8349@0 {
                        device_type = "cpu";
-                       reg = <0>;
-                       d-cache-line-size = <20>;
-                       i-cache-line-size = <20>;
-                       d-cache-size = <8000>;
-                       i-cache-size = <8000>;
+                       reg = <0x0>;
+                       d-cache-line-size = <32>;
+                       i-cache-line-size = <32>;
+                       d-cache-size = <32768>;
+                       i-cache-size = <32768>;
                        timebase-frequency = <0>;       // from bootloader
                        bus-frequency = <0>;            // from bootloader
                        clock-frequency = <0>;          // from bootloader
-                       32-bit;
                };
        };
 
        memory {
                device_type = "memory";
-               reg = <00000000 10000000>;
+               reg = <0x00000000 0x10000000>;
        };
 
        soc8349@e0000000 {
                #address-cells = <1>;
                #size-cells = <1>;
-               #interrupt-cells = <2>;
                device_type = "soc";
-               ranges = <0 e0000000 00100000>;
-               reg = <e0000000 00000200>;
+               ranges = <0x0 0xe0000000 0x00100000>;
+               reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;                    // from bootloader
 
                wdt@200 {
                        device_type = "watchdog";
                        compatible = "mpc83xx_wdt";
-                       reg = <200 100>;
+                       reg = <0x200 0x100>;
                };
 
                i2c@3000 {
-                       device_type = "i2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <0>;
                        compatible = "fsl-i2c";
-                       reg = <3000 100>;
-                       interrupts = <8>;
-                       interrupt-parent = < &ipic >;
+                       reg = <0x3000 0x100>;
+                       interrupts = <14 0x8>;
+                       interrupt-parent = <&ipic>;
                        dfsrr;
                };
 
                i2c@3100 {
-                       device_type = "i2c";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       cell-index = <1>;
                        compatible = "fsl-i2c";
-                       reg = <3100 100>;
-                       interrupts = <8>;
-                       interrupt-parent = < &ipic >;
+                       reg = <0x3100 0x100>;
+                       interrupts = <15 0x8>;
+                       interrupt-parent = <&ipic>;
                        dfsrr;
                };
 
                spi@7000 {
-                       device_type = "spi";
-                       compatible = "mpc83xx_spi";
-                       reg = <7000 1000>;
-                       interrupts = <10 8>;
-                       interrupt-parent = < &ipic >;
-                       mode = <0>;
+                       cell-index = <0>;
+                       compatible = "fsl,spi";
+                       reg = <0x7000 0x1000>;
+                       interrupts = <16 0x8>;
+                       interrupt-parent = <&ipic>;
+                       mode = "cpu";
+               };
+
+               dma@82a8 {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
+                       reg = <0x82a8 4>;
+                       ranges = <0 0x8100 0x1a8>;
+                       interrupt-parent = <&ipic>;
+                       interrupts = <71 8>;
+                       cell-index = <0>;
+                       dma-channel@0 {
+                               compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0 0x80>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+                       dma-channel@80 {
+                               compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0x80 0x80>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+                       dma-channel@100 {
+                               compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0x100 0x80>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
+                       dma-channel@180 {
+                               compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                               reg = <0x180 0x28>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <71 8>;
+                       };
                };
 
                usb@22000 {
-                       device_type = "usb";
                        compatible = "fsl-usb2-mph";
-                       reg = <22000 1000>;
+                       reg = <0x22000 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <27 8>;
+                       interrupt-parent = <&ipic>;
+                       interrupts = <39 0x8>;
                        phy_type = "ulpi";
                        port1;
                };
 
                usb@23000 {
-                       device_type = "usb";
                        compatible = "fsl-usb2-dr";
-                       reg = <23000 1000>;
+                       reg = <0x23000 0x1000>;
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <26 8>;
+                       interrupt-parent = <&ipic>;
+                       interrupts = <38 0x8>;
                        dr_mode = "peripheral";
                        phy_type = "ulpi";
                };
 
                mdio@24520 {
-                       device_type = "mdio";
-                       compatible = "gianfar";
-                       reg = <24520 20>;
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       compatible = "fsl,gianfar-mdio";
+                       reg = <0x24520 0x20>;
 
                        /* Vitesse 8201 */
                        phy1c: ethernet-phy@1c {
-                               interrupt-parent = < &ipic >;
-                               interrupts = <12 8>;
-                               reg = <1c>;
-                               device_type = "ethernet-phy";
-                       };
-
-                       /* Vitesse 7385 */
-                       phy1f: ethernet-phy@1f {
-                               interrupt-parent = < &ipic >;
-                               interrupts = <12 8>;
-                               reg = <1f>;
+                               interrupt-parent = <&ipic>;
+                               interrupts = <18 0x8>;
+                               reg = <0x1c>;
                                device_type = "ethernet-phy";
                        };
                };
 
-               ethernet@24000 {
+               enet0: ethernet@24000 {
+                       cell-index = <0>;
                        device_type = "network";
                        model = "TSEC";
                        compatible = "gianfar";
-                       reg = <24000 1000>;
-                       /*
-                        * address is deprecated and will be removed
-                        * in 2.6.25.  Only recent versions of
-                        * U-Boot support local-mac-address, however.
-                        */
-                       address = [ 00 00 00 00 00 00 ];
+                       reg = <0x24000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <20 8 21 8 22 8>;
-                       interrupt-parent = < &ipic >;
-                       phy-handle = < &phy1c >;
+                       interrupts = <32 0x8 33 0x8 34 0x8>;
+                       interrupt-parent = <&ipic>;
+                       phy-handle = <&phy1c>;
+                       linux,network-index = <0>;
                };
 
-               ethernet@25000 {
-                       #address-cells = <1>;
-                       #size-cells = <0>;
+               enet1: ethernet@25000 {
+                       cell-index = <1>;
                        device_type = "network";
                        model = "TSEC";
                        compatible = "gianfar";
-                       reg = <25000 1000>;
-                       /*
-                        * address is deprecated and will be removed
-                        * in 2.6.25.  Only recent versions of
-                        * U-Boot support local-mac-address, however.
-                        */
-                       address = [ 00 00 00 00 00 00 ];
+                       reg = <0x25000 0x1000>;
                        local-mac-address = [ 00 00 00 00 00 00 ];
-                       interrupts = <23 8 24 8 25 8>;
-                       interrupt-parent = < &ipic >;
-                       phy-handle = < &phy1f >;
+                       interrupts = <35 0x8 36 0x8 37 0x8>;
+                       interrupt-parent = <&ipic>;
+                       /* Vitesse 7385 isn't on the MDIO bus */
+                       fixed-link = <1 1 1000 0 0>;
+                       linux,network-index = <1>;
                };
 
-               serial@4500 {
+               serial0: serial@4500 {
+                       cell-index = <0>;
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <4500 100>;
+                       reg = <0x4500 0x100>;
                        clock-frequency = <0>;          // from bootloader
-                       interrupts = <9 8>;
-                       interrupt-parent = < &ipic >;
+                       interrupts = <9 0x8>;
+                       interrupt-parent = <&ipic>;
                };
 
-               serial@4600 {
+               serial1: serial@4600 {
+                       cell-index = <1>;
                        device_type = "serial";
                        compatible = "ns16550";
-                       reg = <4600 100>;
+                       reg = <0x4600 0x100>;
                        clock-frequency = <0>;          // from bootloader
-                       interrupts = <a 8>;
-                       interrupt-parent = < &ipic >;
-               };
-
-               pci@8500 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x10 - SATA */
-                                       8000 0 0 1 &ipic 16 8 /* SATA_INTA */
-                                       >;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <42 8>;
-                       bus-range = <0 0>;
-                       ranges = <42000000 0 80000000 80000000 0 10000000
-                                 02000000 0 90000000 90000000 0 10000000
-                                 01000000 0 00000000 e2000000 0 01000000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8500 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
-               };
-
-               pci@8600 {
-                       interrupt-map-mask = <f800 0 0 7>;
-                       interrupt-map = <
-                                       /* IDSEL 0x0E - MiniPCI Slot */
-                                       7000 0 0 1 &ipic 15 8 /* PCI_INTA */
-
-                                       /* IDSEL 0x0F - PCI Slot */
-                                       7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                       7800 0 0 2 &ipic 15 8 /* PCI_INTB */
-                                        >;
-                       interrupt-parent = < &ipic >;
-                       interrupts = <43 8>;
-                       bus-range = <1 1>;
-                       ranges = <42000000 0 a0000000 a0000000 0 10000000
-                                 02000000 0 b0000000 b0000000 0 10000000
-                                 01000000 0 00000000 e3000000 0 01000000>;
-                       clock-frequency = <3f940aa>;
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       reg = <8600 100>;
-                       compatible = "fsl,mpc8349-pci";
-                       device_type = "pci";
+                       interrupts = <10 0x8>;
+                       interrupt-parent = <&ipic>;
                };
 
                crypto@30000 {
-                       device_type = "crypto";
-                       model = "SEC2";
-                       compatible = "talitos";
-                       reg = <30000 10000>;
-                       interrupts = <b 8>;
-                       interrupt-parent = < &ipic >;
-                       num-channels = <4>;
-                       channel-fifo-len = <18>;
-                       exec-units-mask = <0000007e>;
-                       descriptor-types-mask = <01010ebf>;
+                       compatible = "fsl,sec2.0";
+                       reg = <0x30000 0x10000>;
+                       interrupts = <11 0x8>;
+                       interrupt-parent = <&ipic>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                ipic: pic@700 {
                        interrupt-controller;
                        #address-cells = <0>;
                        #interrupt-cells = <2>;
-                       reg = <700 100>;
-                       built-in;
+                       reg = <0x700 0x100>;
                        device_type = "ipic";
                };
        };
+
+       pci0: pci@e0008500 {
+               cell-index = <1>;
+               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+               interrupt-map = <
+                               /* IDSEL 0x10 - SATA */
+                               0x8000 0x0 0x0 0x1 &ipic 22 0x8 /* SATA_INTA */
+                               >;
+               interrupt-parent = <&ipic>;
+               interrupts = <66 0x8>;
+               bus-range = <0x0 0x0>;
+               ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                         0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                         0x01000000 0x0 0x00000000 0xe2000000 0x0 0x01000000>;
+               clock-frequency = <66666666>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <0xe0008500 0x100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
+
+       pci1: pci@e0008600 {
+               cell-index = <2>;
+               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+               interrupt-map = <
+                               /* IDSEL 0x0E - MiniPCI Slot */
+                               0x7000 0x0 0x0 0x1 &ipic 21 0x8 /* PCI_INTA */
+
+                               /* IDSEL 0x0F - PCI Slot */
+                               0x7800 0x0 0x0 0x1 &ipic 20 0x8 /* PCI_INTA */
+                               0x7800 0x0 0x0 0x2 &ipic 21 0x8 /* PCI_INTB */
+                               >;
+               interrupt-parent = <&ipic>;
+               interrupts = <67 0x8>;
+               bus-range = <0x0 0x0>;
+               ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                         0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
+                         0x01000000 0x0 0x00000000 0xe3000000 0x0 0x01000000>;
+               clock-frequency = <66666666>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               reg = <0xe0008600 0x100>;
+               compatible = "fsl,mpc8349-pci";
+               device_type = "pci";
+       };
+
+       localbus@e0005000 {
+               #address-cells = <2>;
+               #size-cells = <1>;
+               compatible = "fsl,mpc8349e-localbus",
+                            "fsl,pq2pro-localbus";
+               reg = <0xe0005000 0xd8>;
+               ranges = <0x3 0x0 0xf0000000 0x210>;
+
+               pata@3,0 {
+                       compatible = "fsl,mpc8349emitx-pata", "ata-generic";
+                       reg = <0x3 0x0 0x10 0x3 0x20c 0x4>;
+                       reg-shift = <1>;
+                       pio-mode = <6>;
+                       interrupts = <23 0x8>;
+                       interrupt-parent = <&ipic>;
+               };
+       };
 };