[POWERPC] Rewrite Freescale PCI/PCIe support for 8{3,5,6}xx

[linux-2.6] / arch / powerpc / boot / dts / mpc8641_hpcn.dts

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 260b264c869eeffc0b8aaebc52d25edca645fb23..5d82709cfcbb38fbd7ee13596f415c2dc38d6972 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -56,8 +56,12 @@
                #size-cells = <1>;
                #interrupt-cells = <2>;
                device_type = "soc";
-               ranges = <0 f8000000 00100000>;
-               reg = <f8000000 00100000>;      // CCSRBAR 1M
+               ranges = <00001000 f8001000 000ff000
+                         80000000 80000000 20000000
+                         e2000000 e2000000 00100000
+                         a0000000 a0000000 20000000
+                         e3000000 e3000000 00100000>;
+               reg = <f8000000 00001000>;      // CCSRBAR
                bus-frequency = <0>;
 
                i2c@3000 {
@@ -86,25 +90,25 @@
                        reg = <24520 20>;
                        phy0: ethernet-phy@0 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <4a 1>;
+                               interrupts = <a 1>;
                                reg = <0>;
                                device_type = "ethernet-phy";
                        };
                        phy1: ethernet-phy@1 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <4a 1>;
+                               interrupts = <a 1>;
                                reg = <1>;
                                device_type = "ethernet-phy";
                        };
                        phy2: ethernet-phy@2 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <4a 1>;
+                               interrupts = <a 1>;
                                reg = <2>;
                                device_type = "ethernet-phy";
                        };
                        phy3: ethernet-phy@3 {
                                interrupt-parent = <&mpic>;
-                               interrupts = <4a 1>;
+                               interrupts = <a 1>;
                                reg = <3>;
                                device_type = "ethernet-phy";
                        };
@@ -117,10 +121,17 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <24000 1000>;
-                       mac-address = [ 00 E0 0C 00 73 00 ];
+                       /*
+                        * mac-address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       mac-address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <1d 2 1e 2 22 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy0>;
+                       phy-connection-type = "rgmii-id";
                };
 
                ethernet@25000 {
@@ -130,10 +141,17 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <25000 1000>;
-                       mac-address = [ 00 E0 0C 00 73 01 ];
+                       /*
+                        * mac-address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       mac-address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <23 2 24 2 28 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy1>;
+                       phy-connection-type = "rgmii-id";
                };
                
                ethernet@26000 {
@@ -143,10 +161,17 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <26000 1000>;
-                       mac-address = [ 00 E0 0C 00 02 FD ];
+                       /*
+                        * mac-address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       mac-address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <1F 2 20 2 21 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy2>;
+                       phy-connection-type = "rgmii-id";
                };
 
                ethernet@27000 {
@@ -156,10 +181,17 @@
                        model = "TSEC";
                        compatible = "gianfar";
                        reg = <27000 1000>;
-                       mac-address = [ 00 E0 0C 00 03 FD ];
+                       /*
+                        * mac-address is deprecated and will be removed
+                        * in 2.6.25.  Only recent versions of
+                        * U-Boot support local-mac-address, however.
+                        */
+                       mac-address = [ 00 00 00 00 00 00 ];
+                       local-mac-address = [ 00 00 00 00 00 00 ];
                        interrupts = <25 2 26 2 27 2>;
                        interrupt-parent = <&mpic>;
                        phy-handle = <&phy3>;
+                       phy-connection-type = "rgmii-id";
                };
                serial@4500 {
                        device_type = "serial";
@@ -179,14 +211,14 @@
                        interrupt-parent = <&mpic>;
                };
 
-               pci@8000 {
-                       compatible = "86xx";
+               pcie@8000 {
+                       compatible = "fsl,mpc8641-pcie";
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
                        #address-cells = <3>;
                        reg = <8000 1000>;
-                       bus-range = <0 fe>;
+                       bus-range = <0 ff>;
                        ranges = <02000000 0 80000000 80000000 0 20000000
                                  01000000 0 00000000 e2000000 0 00100000>;
                        clock-frequency = <1fca055>;
@@ -285,23 +317,90 @@
                                f800 0 0 3 &i8259 0 0
                                f800 0 0 4 &i8259 0 0
                                >;
-                       i8259: i8259@4d0 {
-                               clock-frequency = <0>;
-                               interrupt-controller;
-                               device_type = "interrupt-controller";
-                               #address-cells = <0>;
-                               #interrupt-cells = <2>;
-                               built-in;
-                               compatible = "chrp,iic";
-                               big-endian;
-                               interrupts = <49 2>;
-                               interrupt-parent = <&mpic>;
+                       uli1575@0 {
+                               reg = <0 0 0 0 0>;
+                               #size-cells = <2>;
+                               #address-cells = <3>;
+                               ranges = <02000000 0 80000000
+                                         02000000 0 80000000
+                                         0 20000000
+                                         01000000 0 00000000
+                                         01000000 0 00000000
+                                         0 00100000>;
+
+                               pci_bridge@0 {
+                                       reg = <0 0 0 0 0>;
+                                       #size-cells = <2>;
+                                       #address-cells = <3>;
+                                       ranges = <02000000 0 80000000
+                                                 02000000 0 80000000
+                                                 0 20000000
+                                                 01000000 0 00000000
+                                                 01000000 0 00000000
+                                                 0 00100000>;
+
+                                       isa@1e {
+                                               device_type = "isa";
+                                               #interrupt-cells = <2>;
+                                               #size-cells = <1>;
+                                               #address-cells = <2>;
+                                               reg = <f000 0 0 0 0>;
+                                               ranges = <1 0 01000000 0 0
+                                                         00001000>;
+                                               interrupt-parent = <&i8259>;
+
+                                               i8259: interrupt-controller@20 {
+                                                       reg = <1 20 2
+                                                              1 a0 2
+                                                              1 4d0 2>;
+                                                       clock-frequency = <0>;
+                                                       interrupt-controller;
+                                                       device_type = "interrupt-controller";
+                                                       #address-cells = <0>;
+                                                       #interrupt-cells = <2>;
+                                                       built-in;
+                                                       compatible = "chrp,iic";
+                                                       interrupts = <9 2>;
+                                                       interrupt-parent =
+                                                               <&mpic>;
+                                               };
+
+                                               i8042@60 {
+                                                       #size-cells = <0>;
+                                                       #address-cells = <1>;
+                                                       reg = <1 60 1 1 64 1>;
+                                                       interrupts = <1 3 c 3>;
+                                                       interrupt-parent =
+                                                               <&i8259>;
+
+                                                       keyboard@0 {
+                                                               reg = <0>;
+                                                               compatible = "pnpPNP,303";
+                                                       };
+
+                                                       mouse@1 {
+                                                               reg = <1>;
+                                                               compatible = "pnpPNP,f03";
+                                                       };
+                                               };
+
+                                               rtc@70 {
+                                                       compatible =
+                                                               "pnpPNP,b00";
+                                                       reg = <1 70 2>;
+                                               };
+
+                                               gpio@400 {
+                                                       reg = <1 400 80>;
+                                               };
+                                       };
+                               };
                        };
 
                };
 
-               pci@9000 {
-                       compatible = "86xx";
+               pcie@9000 {
+                       compatible = "fsl,mpc8641-pcie";
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -316,10 +415,10 @@
                        interrupt-map-mask = <f800 0 0 7>;
                        interrupt-map = <
                                /* IDSEL 0x0 */
-                               0000 0 0 1 &mpic 44 1
-                               0000 0 0 2 &mpic 45 1
-                               0000 0 0 3 &mpic 46 1
-                               0000 0 0 4 &mpic 47 1
+                               0000 0 0 1 &mpic 4 1
+                               0000 0 0 2 &mpic 5 1
+                               0000 0 0 3 &mpic 6 1
+                               0000 0 0 4 &mpic 7 1
                                >;
                };