aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-05-10 11:01:18 -0400
committerLennert Buytenhek <buytenh@marvell.com>2008-06-22 16:44:46 -0400
commit386a048a1ea42ff9ac87ffa344c4c19a5cc59678 (patch)
treefd6cab0e6bf41c5b112ce00f8cc36cc30ab6edfd
parent044f6c7c449ae8ba0353b032706b098a7ad5e304 (diff)
[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>
-rw-r--r--arch/arm/mach-orion5x/dns323-setup.c7
-rw-r--r--arch/arm/mach-orion5x/kurobox_pro-setup.c6
-rw-r--r--arch/arm/mach-orion5x/pci.c2
-rw-r--r--arch/arm/mach-orion5x/rd88f5182-setup.c6
-rw-r--r--arch/arm/mach-orion5x/ts209-setup.c6
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)
247 /* Setup basic Orion functions. Need to be called early. */ 247 /* Setup basic Orion functions. Need to be called early. */
248 orion5x_init(); 248 orion5x_init();
249 249
250 /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe
251 *
252 * Open a special address decode windows for the PCIe WA.
253 */
254 orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
255 ORION5X_PCIE_WA_SIZE);
256
257 /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */ 250 /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */
258 orion5x_write(MPP_0_7_CTRL, 0); 251 orion5x_write(MPP_0_7_CTRL, 0);
259 orion5x_write(MPP_8_15_CTRL, 0); 252 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)
188 orion5x_init(); 188 orion5x_init();
189 189
190 /* 190 /*
191 * Open a special address decode windows for the PCIe WA.
192 */
193 orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
194 ORION5X_PCIE_WA_SIZE);
195
196 /*
197 * Setup Multiplexing Pins -- 191 * Setup Multiplexing Pins --
198 * MPP[0-1] Not used 192 * MPP[0-1] Not used
199 * MPP[2] GPIO Micon 193 * 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)
152 if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) { 152 if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
153 printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config " 153 printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config "
154 "read transaction workaround\n"); 154 "read transaction workaround\n");
155 orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
156 ORION5X_PCIE_WA_SIZE);
155 pcie_ops.read = pcie_rd_conf_wa; 157 pcie_ops.read = pcie_rd_conf_wa;
156 } 158 }
157 159
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)
249 orion5x_init(); 249 orion5x_init();
250 250
251 /* 251 /*
252 * Open a special address decode windows for the PCIe WA.
253 */
254 orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
255 ORION5X_PCIE_WA_SIZE);
256
257 /*
258 * Setup Multiplexing Pins -- 252 * Setup Multiplexing Pins --
259 * MPP[0] Debug Led (GPIO - Out) 253 * MPP[0] Debug Led (GPIO - Out)
260 * MPP[1] Debug Led (GPIO - Out) 254 * 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)
365 orion5x_init(); 365 orion5x_init();
366 366
367 /* 367 /*
368 * Open a special address decode windows for the PCIe WA.
369 */
370 orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
371 ORION5X_PCIE_WA_SIZE);
372
373 /*
374 * Setup Multiplexing Pins -- 368 * Setup Multiplexing Pins --
375 * MPP[0] Reserved 369 * MPP[0] Reserved
376 * MPP[1] USB copy button (0 active) 370 * MPP[1] USB copy button (0 active)