[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 cd200f766099653d5be6c1c826b1bfd15a38aab9..9ec53501b2a8ad0e0f205892d0632cd9509631da 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 10d9fc2ef11a40a984ba35049d9711be0916ee4e..61755fe175cd93e25b88308d116679ccde571e31 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 1bbfe24607b00b3dbbfecd34f250083ab58ca05b..275a50046c1fe2ee4f1838d198257e3d84066507 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 4496ed1cab730076e504012c3236c6aeccce6140..403ba9a0c9bd4e437adfdc303f87ad9f55b24d3c 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 b62fdb6cf6cb77a1ec323252674e508e6e89672a..0ec067fcb514617b76c89735bca9f136bd9557ab 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