diff options
| -rw-r--r-- | arch/arm/mach-orion5x/dns323-setup.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/pci.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f5182-setup.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/ts209-setup.c | 6 |
5 files changed, 2 insertions, 25 deletions
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c index cd200f766099..9ec53501b2a8 100644 --- 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 10d9fc2ef11a..61755fe175cd 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -188,12 +188,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 * MPP[2] GPIO Micon diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c index 1bbfe24607b0..275a50046c1f 100644 --- 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 4496ed1cab73..403ba9a0c9bd 100644 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c @@ -249,12 +249,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) * MPP[1] Debug Led (GPIO - Out) diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c index b62fdb6cf6cb..0ec067fcb514 100644 --- a/arch/arm/mach-orion5x/ts209-setup.c +++ b/arch/arm/mach-orion5x/ts209-setup.c @@ -365,12 +365,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 * MPP[1] USB copy button (0 active) |