[POWERPC] Make endianess of cfg_addr for indirect pci ops runtime

Make it so we do a runtime check to know if we need to write cfg_addr
as big or little endian.  This is needed if we want to allow 86xx support
to co-exist in the same kernel as other 6xx PPCs.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

6 files changed, 9 insertions, 9 deletions

diff --git a/arch/powerpc/platforms/82xx/mpc82xx_ads.c b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
index da20832b27f1..2d1b05b9f8ef 100644
--- a/arch/powerpc/platforms/82xx/mpc82xx_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc82xx_ads.c
@@ -553,7 +553,8 @@ static void __init mpc82xx_add_bridge(struct device_node *np)
 
         setup_indirect_pci(hose,
                            r.start + offsetof(pci_cpm2_t, pci_cfg_addr),
-                           r.start + offsetof(pci_cpm2_t, pci_cfg_data));
+                           r.start + offsetof(pci_cpm2_t, pci_cfg_data),
+                           0);
 
         pci_process_bridge_OF_ranges(hose, np, 1);
 }
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c
index c0e2b89154e5..92069469de20 100644
--- a/arch/powerpc/platforms/83xx/pci.c
+++ b/arch/powerpc/platforms/83xx/pci.c
@@ -74,11 +74,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
          */
         /* PCI 1 */
         if ((rsrc.start & 0xfffff) == 0x8500) {
-                setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304);
+                setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304, 0);
         }
         /* PCI 2 */
         if ((rsrc.start & 0xfffff) == 0x8600) {
-                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384);
+                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384, 0);
                 primary = 0;
         }
 
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 526ddde2f186..4661fccdaa5a 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -51,7 +51,6 @@ config MPC85xx
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI if PCI
-        select PPC_INDIRECT_PCI_BE if PCI
         select MPIC
         select FSL_PCI if PCI
         select SERIAL_8250_SHARE_IRQ if SERIAL_8250
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index d1c8115200bc..343b76d0d793 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -14,7 +14,6 @@ endchoice
 
 config MPC8641
         bool
-        select PPC_INDIRECT_PCI_BE if PCI
         select FSL_PCI if PCI
         select PPC_UDBG_16550
         select MPIC
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 3690624e49d4..28d1647b204e 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -181,7 +181,7 @@ setup_python(struct pci_controller *hose, struct device_node *dev)
         }
         iounmap(reg);
 
-        setup_indirect_pci(hose, r.start + 0xf8000, r.start + 0xf8010);
+        setup_indirect_pci(hose, r.start + 0xf8000, r.start + 0xf8010, 0);
 }
 
 /* Marvell Discovery II based Pegasos 2 */
@@ -277,13 +277,14 @@ chrp_find_bridges(void)
                         hose->cfg_data = p;
                         gg2_pci_config_base = p;
                 } else if (is_pegasos == 1) {
-                        setup_indirect_pci(hose, 0xfec00cf8, 0xfee00cfc);
+                        setup_indirect_pci(hose, 0xfec00cf8, 0xfee00cfc, 0);
                 } else if (is_pegasos == 2) {
                         setup_peg2(hose, dev);
                 } else if (!strncmp(model, "IBM,CPC710", 10)) {
                         setup_indirect_pci(hose,
                                            r.start + 0x000f8000,
-                                           r.start + 0x000f8010);
+                                           r.start + 0x000f8010,
+                                           0);
                         if (index == 0) {
                                 dma = of_get_property(dev, "system-dma-base",
                                                         &len);
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index f4d0a7a603f5..bd5ca58345a1 100644
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -73,7 +73,7 @@ static int __init linkstation_add_bridge(struct device_node *dev)
                 return -ENOMEM;
         hose->first_busno = bus_range ? bus_range[0] : 0;
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
-        setup_indirect_pci(hose, 0xfec00000, 0xfee00000);
+        setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
 
         /* Interpret the "ranges" property */
         /* This also maps the I/O region and sets isa_io/mem_base */