[POWERPC] celleb: Consolidate io-workarounds code

Now, we can use generic io-workarounds mechanism and the workaround
code for spider-pci. This changes Celleb PCI code to use spider-pci
code.

Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 26 insertions, 15 deletions

diff --git a/arch/powerpc/platforms/celleb/pci.c b/arch/powerpc/platforms/celleb/pci.c
index 51b390d34e4d..539d2cc59542 100644
--- a/arch/powerpc/platforms/celleb/pci.c
+++ b/arch/powerpc/platforms/celleb/pci.c
@@ -41,6 +41,7 @@
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
 
+#include "../cell/io-workarounds.h"
 #include "pci.h"
 #include "interrupt.h"
 
@@ -457,33 +458,39 @@ static int __init celleb_setup_fake_pci(struct device_node *dev,
         return 0;
 }
 
-void __init fake_pci_workaround_init(struct pci_controller *phb)
-{
-        /**
-         *  We will add fake pci bus to scc_pci_bus for the purpose to improve
-         *  I/O Macro performance. But device-tree and device drivers
-         *  are not ready to use address with a token.
-         */
-
-        /* celleb_pci_add_one(phb, NULL); */
-}
+static struct celleb_phb_spec celleb_fake_pci_spec __initdata = {
+        .setup = celleb_setup_fake_pci,
+};
 
 static struct of_device_id celleb_phb_match[] __initdata = {
         {
                 .name = "pci-pseudo",
-                .data = celleb_setup_fake_pci,
+                .data = &celleb_fake_pci_spec,
         }, {
                 .name = "epci",
-                .data = celleb_setup_epci,
+                .data = &celleb_epci_spec,
         }, {
         },
 };
 
+static int __init celleb_io_workaround_init(struct pci_controller *phb,
+                                            struct celleb_phb_spec *phb_spec)
+{
+        if (phb_spec->ops) {
+                iowa_register_bus(phb, phb_spec->ops, phb_spec->iowa_init,
+                                  phb_spec->iowa_data);
+                io_workaround_init();
+        }
+
+        return 0;
+}
+
 int __init celleb_setup_phb(struct pci_controller *phb)
 {
         struct device_node *dev = phb->dn;
         const struct of_device_id *match;
-        int (*setup_func)(struct device_node *, struct pci_controller *);
+        struct celleb_phb_spec *phb_spec;
+        int rc;
 
         match = of_match_node(celleb_phb_match, dev);
         if (!match)
@@ -492,8 +499,12 @@ int __init celleb_setup_phb(struct pci_controller *phb)
         phb_set_bus_ranges(dev, phb);
         phb->buid = 1;
 
-        setup_func = match->data;
-        return (*setup_func)(dev, phb);
+        phb_spec = match->data;
+        rc = (*phb_spec->setup)(dev, phb);
+        if (rc)
+                return 1;
+
+        return celleb_io_workaround_init(phb, phb_spec);
 }
 
 int celleb_pci_probe_mode(struct pci_bus *bus)