powerpc/86xx: Move pci1 definition to the include file

Signed-off-by: Alessio Igor Bogani <alessio.bogani@elettra.eu>
Signed-off-by: Scott Wood <oss@buserror.net>

diff --git a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
index 0424fc2bd0e0e9cbc18f6bbbd033d9d11df356c0..c88d4ef9e4f794c41872bcb6d58757d3173a5ef8 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_ppc9a.dts
@@ -211,6 +211,10 @@ pcie@0 {
                                  0x0 0x00400000>;
                };
        };
+
+       pci1: pcie@fef09000 {
+               status = "disabled";
+       };
 };
 
 /include/ "mpc8641si-post.dtsi"

diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
index 84b3d38f880edb37a52fd03d35062de31ce23ac5..838515798cce4d2275da02ca4d8ace52f5f8c1e9 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc310.dts
@@ -24,10 +24,6 @@ / {
        model = "GEF_SBC310";
        compatible = "gef,sbc310";
 
-       aliases {
-               pci1 = &pci1;
-       };
-
        memory {
                device_type = "memory";
                reg = <0x0 0x40000000>; // set by uboot
@@ -223,29 +219,11 @@ pcie@0 {
        };
 
        pci1: pcie@fef09000 {
-               compatible = "fsl,mpc8641-pcie";
-               device_type = "pci";
-               #size-cells = <2>;
-               #address-cells = <3>;
                reg = <0xfef09000 0x1000>;
-               bus-range = <0x0 0xff>;
                ranges = <0x02000000 0x0 0xc0000000 0xc0000000 0x0 0x20000000
                          0x01000000 0x0 0x00000000 0xfe400000 0x0 0x00400000>;
-               clock-frequency = <100000000>;
-               interrupts = <0x19 0x2 0 0>;
-               interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
-               interrupt-map = <
-                       0x0000 0x0 0x0 0x1 &mpic 0x4 0x2
-                       0x0000 0x0 0x0 0x2 &mpic 0x5 0x2
-                       0x0000 0x0 0x0 0x3 &mpic 0x6 0x2
-                       0x0000 0x0 0x0 0x4 &mpic 0x7 0x2
-                       >;
 
                pcie@0 {
-                       reg = <0 0 0 0 0>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       device_type = "pci";
                        ranges = <0x02000000 0x0 0xc0000000
                                  0x02000000 0x0 0xc0000000
                                  0x0 0x20000000

diff --git a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
index 974446acce23c13b5e67d19636bb251e763444f0..ff423ab424f2d3bd597ef21af5e7ff64e2b4c901 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
+++ b/arch/powerpc/boot/dts/fsl/gef_sbc610.dts
@@ -209,6 +209,10 @@ pcie@0 {
                                  0x0 0x00400000>;
                };
        };
+
+       pci1: pcie@fef09000 {
+               status = "disabled";
+       };
 };
 
 /include/ "mpc8641si-post.dtsi"

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
index 554001f2e96a3b8998022a0f83b3096a0ff96325..11bea3e6a43f4eaecd019d3970a3155d549503bd 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts
@@ -15,10 +15,6 @@ / {
        model = "MPC8641HPCN";
        compatible = "fsl,mpc8641hpcn";
 
-       aliases {
-               pci1 = &pci1;
-       };
-
        memory {
                device_type = "memory";
                reg = <0x00000000 0x40000000>;  // 1G at 0x0
@@ -359,29 +355,11 @@ gpio@400 {
        };
 
        pci1: pcie@ffe09000 {
-               compatible = "fsl,mpc8641-pcie";
-               device_type = "pci";
-               #size-cells = <2>;
-               #address-cells = <3>;
                reg = <0xffe09000 0x1000>;
-               bus-range = <0 0xff>;
                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
                          0x01000000 0x0 0x00000000 0xffc10000 0x0 0x00010000>;
-               clock-frequency = <100000000>;
-               interrupts = <25 2 0 0>;
-               interrupt-map-mask = <0xf800 0 0 7>;
-               interrupt-map = <
-                       /* IDSEL 0x0 */
-                       0x0000 0 0 1 &mpic 4 1
-                       0x0000 0 0 2 &mpic 5 1
-                       0x0000 0 0 3 &mpic 6 1
-                       0x0000 0 0 4 &mpic 7 1
-                       >;
+
                pcie@0 {
-                       reg = <0 0 0 0 0>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       device_type = "pci";
                        ranges = <0x02000000 0x0 0xa0000000
                                  0x02000000 0x0 0xa0000000
                                  0x0 0x20000000

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
index fec58671a6d6ece0b8cda1e6338ed700689788a7..7ff62046a9ea808dc2ce1373b38b1038d7a02762 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
+++ b/arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts
@@ -17,10 +17,6 @@ / {
        #address-cells = <2>;
        #size-cells = <2>;
 
-       aliases {
-               pci1 = &pci1;
-       };
-
        memory {
                device_type = "memory";
                reg = <0x0 0x00000000 0x0 0x40000000>;  // 1G at 0x0
@@ -326,29 +322,11 @@ gpio@400 {
        };
 
        pci1: pcie@fffe09000 {
-               compatible = "fsl,mpc8641-pcie";
-               device_type = "pci";
-               #size-cells = <2>;
-               #address-cells = <3>;
                reg = <0x0f 0xffe09000 0x0 0x1000>;
-               bus-range = <0x0 0xff>;
                ranges = <0x02000000 0x0 0xe0000000 0x0c 0x20000000 0x0 0x20000000
                          0x01000000 0x0 0x00000000 0x0f 0xffc10000 0x0 0x00010000>;
-               clock-frequency = <100000000>;
-               interrupts = <25 2 0 0>;
-               interrupt-map-mask = <0xf800 0 0 7>;
-               interrupt-map = <
-                       /* IDSEL 0x0 */
-                       0x0000 0 0 1 &mpic 4 1
-                       0x0000 0 0 2 &mpic 5 1
-                       0x0000 0 0 3 &mpic 6 1
-                       0x0000 0 0 4 &mpic 7 1
-                       >;
+
                pcie@0 {
-                       reg = <0 0 0 0 0>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       device_type = "pci";
                        ranges = <0x02000000 0x0 0xe0000000
                                  0x02000000 0x0 0xe0000000
                                  0x0 0x20000000

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
index 70889d8e885009b1e4c20dfb14113871722c09fa..a76ffda57f8ee04e8946cabf564fb1fe91d01cbe 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi
@@ -113,6 +113,33 @@ &pci0 {
 
        pcie@0 {
                reg = <0 0 0 0 0>;
+               #interrupt-cells = <1>;
+               #size-cells = <2>;
+               #address-cells = <3>;
+               device_type = "pci";
+       };
+};
+
+&pci1 {
+       compatible = "fsl,mpc8641-pcie";
+       device_type = "pci";
+       #size-cells = <2>;
+       #address-cells = <3>;
+       bus-range = <0x0 0xff>;
+       clock-frequency = <100000000>;
+       interrupts = <25 2 0 0>;
+       interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+
+       interrupt-map = <
+               0x0000 0x0 0x0 0x1 &mpic 0x4 0x1
+               0x0000 0x0 0x0 0x2 &mpic 0x5 0x1
+               0x0000 0x0 0x0 0x3 &mpic 0x6 0x1
+               0x0000 0x0 0x0 0x4 &mpic 0x7 0x1
+               >;
+
+       pcie@0 {
+               reg = <0 0 0 0 0>;
+               #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
                device_type = "pci";

diff --git a/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi b/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
index 9e03328561d342d7abf7b4e396280ef500cc32b2..7c6db6f7c12e66e1e2c128270adb870568faad70 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi
@@ -25,6 +25,7 @@ aliases {
                serial0 = &serial0;
                serial1 = &serial1;
                pci0 = &pci0;
+               pci1 = &pci1;
        };
 
        cpus {

diff --git a/arch/powerpc/boot/dts/fsl/sbc8641d.dts b/arch/powerpc/boot/dts/fsl/sbc8641d.dts
index 0a9733cd418db8540deaf4af5d4856c94e604d31..75870a12490360848fcc7538f238eab7c03220f1 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/fsl/sbc8641d.dts
@@ -19,10 +19,6 @@ / {
        model = "SBC8641D";
        compatible = "wind,sbc8641";
 
-       aliases {
-               pci1 = &pci1;
-       };
-
        memory {
                device_type = "memory";
                reg = <0x00000000 0x20000000>;  // 512M at 0x0
@@ -165,30 +161,11 @@ pcie@0 {
        };
 
        pci1: pcie@f8009000 {
-               compatible = "fsl,mpc8641-pcie";
-               device_type = "pci";
-               #size-cells = <2>;
-               #address-cells = <3>;
                reg = <0xf8009000 0x1000>;
-               bus-range = <0 0xff>;
                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
                          0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
-               clock-frequency = <100000000>;
-               interrupts = <25 2 0 0>;
-               interrupt-map-mask = <0xf800 0 0 7>;
-               interrupt-map = <
-                       /* IDSEL 0x0 */
-                       0x0000 0 0 1 &mpic 4 1
-                       0x0000 0 0 2 &mpic 5 1
-                       0x0000 0 0 3 &mpic 6 1
-                       0x0000 0 0 4 &mpic 7 1
-                       >;
 
                pcie@0 {
-                       reg = <0 0 0 0 0>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       device_type = "pci";
                        ranges = <0x02000000 0x0 0xa0000000
                                  0x02000000 0x0 0xa0000000
                                  0x0 0x20000000