[ARM] Orion: move setting up PCIe WA window into PCIe setup path

It makes no sense to do PCIe WA window setup in the individual
board support files while the decision whether or not to use the
PCIe WA access method is made in a different place, in the PCIe
support code.

This patch moves the configuration of a PCIe WA window from the
individual Orion board support files to the central Orion PCIe
support code.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Russell King <linux@arm.linux.org.uk>

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index cd200f7..9ec5350 100644 (file)
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -247,13 +247,6 @@ static void __init dns323_init(void)
        /* Setup basic Orion functions. Need to be called early. */
        orion5x_init();
 
-       /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe
-        *
-        * Open a special address decode windows for the PCIe WA.
-        */
-       orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
-                               ORION5X_PCIE_WA_SIZE);
-
        /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */
        orion5x_write(MPP_0_7_CTRL, 0);
        orion5x_write(MPP_8_15_CTRL, 0);

diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 10d9fc2..61755fe 100644 (file)
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -187,12 +187,6 @@ static void __init kurobox_pro_init(void)
         */
        orion5x_init();
 
-       /*
-        * Open a special address decode windows for the PCIe WA.
-        */
-       orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
-                               ORION5X_PCIE_WA_SIZE);
-
        /*
         * Setup Multiplexing Pins --
         * MPP[0-1] Not used

diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index 1bbfe24..275a500 100644 (file)
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -152,6 +152,8 @@ static int __init pcie_setup(struct pci_sys_data *sys)
        if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
                printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config "
                                   "read transaction workaround\n");
+               orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
+                                         ORION5X_PCIE_WA_SIZE);
                pcie_ops.read = pcie_rd_conf_wa;
        }
 

diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 4496ed1..403ba9a 100644 (file)
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -248,12 +248,6 @@ static void __init rd88f5182_init(void)
         */
        orion5x_init();
 
-       /*
-        * Open a special address decode windows for the PCIe WA.
-        */
-       orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
-                               ORION5X_PCIE_WA_SIZE);
-
        /*
         * Setup Multiplexing Pins --
         * MPP[0] Debug Led (GPIO - Out)

diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index b62fdb6..0ec067f 100644 (file)
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -364,12 +364,6 @@ static void __init qnap_ts209_init(void)
         */
        orion5x_init();
 
-       /*
-        * Open a special address decode windows for the PCIe WA.
-        */
-       orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
-                               ORION5X_PCIE_WA_SIZE);
-
        /*
         * Setup Multiplexing Pins --
         * MPP[0] Reserved