From 551b873ee8c384c519698139ee4f586d63a6963c Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Fri, 21 Dec 2007 15:39:37 +1100 Subject: [PATCH] --- yaml --- r: 81183 b: refs/heads/master c: 25c24f3dc7f01491ea0d92a1de2bb84094b27e21 h: refs/heads/master i: 81181: 9c5f1d1615791627a628e64d47d68c932ef2d7e5 81179: 01f78ebb3b65ed8cb92099e2006dc0086bc5fea2 81175: 2a9878b8490e376adb5b1b942731995663af8d80 81167: fe7371991c6da5d43ecbac6171978d5eed2090ad 81151: 3ef13a0506408c08f10c7be38116777f12d5366e v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/40x/ep405.c | 2 ++ trunk/arch/powerpc/platforms/40x/kilauea.c | 3 +++ trunk/arch/powerpc/platforms/40x/walnut.c | 3 +++ trunk/arch/powerpc/platforms/44x/bamboo.c | 4 ++++ trunk/arch/powerpc/platforms/44x/ebony.c | 3 +++ trunk/arch/powerpc/platforms/44x/katmai.c | 3 +++ trunk/arch/powerpc/platforms/44x/sequoia.c | 5 ++++- trunk/arch/powerpc/platforms/44x/taishan.c | 2 ++ 9 files changed, 25 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c82d97e1858a..c00a99443ecd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 035ee4282dc5ad19f0141821511346b8de1839af +refs/heads/master: 25c24f3dc7f01491ea0d92a1de2bb84094b27e21 diff --git a/trunk/arch/powerpc/platforms/40x/ep405.c b/trunk/arch/powerpc/platforms/40x/ep405.c index ba84a41e63e6..759d937cdb65 100644 --- a/trunk/arch/powerpc/platforms/40x/ep405.c +++ b/trunk/arch/powerpc/platforms/40x/ep405.c @@ -101,6 +101,8 @@ static void __init ep405_setup_arch(void) { /* Find & init the BCSR CPLD */ ep405_init_bcsr(); + + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; } static int __init ep405_probe(void) diff --git a/trunk/arch/powerpc/platforms/40x/kilauea.c b/trunk/arch/powerpc/platforms/40x/kilauea.c index 1bffdbdd21b1..4470940065b7 100644 --- a/trunk/arch/powerpc/platforms/40x/kilauea.c +++ b/trunk/arch/powerpc/platforms/40x/kilauea.c @@ -19,6 +19,7 @@ #include #include #include +#include static struct of_device_id kilauea_of_bus[] = { { .compatible = "ibm,plb4", }, @@ -45,6 +46,8 @@ static int __init kilauea_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,kilauea")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/trunk/arch/powerpc/platforms/40x/walnut.c b/trunk/arch/powerpc/platforms/40x/walnut.c index ff6db2431798..aea97017a7d4 100644 --- a/trunk/arch/powerpc/platforms/40x/walnut.c +++ b/trunk/arch/powerpc/platforms/40x/walnut.c @@ -24,6 +24,7 @@ #include #include #include +#include static struct of_device_id walnut_of_bus[] = { { .compatible = "ibm,plb3", }, @@ -51,6 +52,8 @@ static int __init walnut_probe(void) if (!of_flat_dt_is_compatible(root, "ibm,walnut")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/trunk/arch/powerpc/platforms/44x/bamboo.c b/trunk/arch/powerpc/platforms/44x/bamboo.c index be23f112184f..553c9f18aa77 100644 --- a/trunk/arch/powerpc/platforms/44x/bamboo.c +++ b/trunk/arch/powerpc/platforms/44x/bamboo.c @@ -21,6 +21,8 @@ #include #include #include +#include + #include "44x.h" static struct of_device_id bamboo_of_bus[] = { @@ -48,6 +50,8 @@ static int __init bamboo_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,bamboo")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/trunk/arch/powerpc/platforms/44x/ebony.c b/trunk/arch/powerpc/platforms/44x/ebony.c index 6cd3476767cc..262f300cc10d 100644 --- a/trunk/arch/powerpc/platforms/44x/ebony.c +++ b/trunk/arch/powerpc/platforms/44x/ebony.c @@ -24,6 +24,7 @@ #include #include #include +#include #include "44x.h" @@ -55,6 +56,8 @@ static int __init ebony_probe(void) if (!of_flat_dt_is_compatible(root, "ibm,ebony")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/trunk/arch/powerpc/platforms/44x/katmai.c b/trunk/arch/powerpc/platforms/44x/katmai.c index fd737d10f6e4..158ca0558a00 100644 --- a/trunk/arch/powerpc/platforms/44x/katmai.c +++ b/trunk/arch/powerpc/platforms/44x/katmai.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "44x.h" @@ -49,6 +50,8 @@ static int __init katmai_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,katmai")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/trunk/arch/powerpc/platforms/44x/sequoia.c b/trunk/arch/powerpc/platforms/44x/sequoia.c index 21a9dd14f297..5185b5cb48c9 100644 --- a/trunk/arch/powerpc/platforms/44x/sequoia.c +++ b/trunk/arch/powerpc/platforms/44x/sequoia.c @@ -21,7 +21,8 @@ #include #include #include -#include "44x.h" +#include + static struct of_device_id sequoia_of_bus[] = { { .compatible = "ibm,plb4", }, @@ -48,6 +49,8 @@ static int __init sequoia_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,sequoia")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; } diff --git a/trunk/arch/powerpc/platforms/44x/taishan.c b/trunk/arch/powerpc/platforms/44x/taishan.c index e3b7c7023336..ca71666bde27 100644 --- a/trunk/arch/powerpc/platforms/44x/taishan.c +++ b/trunk/arch/powerpc/platforms/44x/taishan.c @@ -60,6 +60,8 @@ static int __init taishan_probe(void) if (!of_flat_dt_is_compatible(root, "amcc,taishan")) return 0; + ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC; + return 1; }