1 It makes no sense to do PCIe WA window setup in the individual
2 board support files while the decision whether or not to use the
3 PCIe WA access method is made in a different place, in the PCIe
6 This patch moves the configuration of a PCIe WA window from the
7 individual Orion board support files to the central Orion PCIe
10 Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
12 arch/arm/mach-orion5x/dns323-setup.c | 7 -------
13 arch/arm/mach-orion5x/kurobox_pro-setup.c | 6 ------
14 arch/arm/mach-orion5x/pci.c | 2 ++
15 arch/arm/mach-orion5x/rd88f5182-setup.c | 6 ------
16 arch/arm/mach-orion5x/ts209-setup.c | 6 ------
17 5 files changed, 2 insertions(+), 25 deletions(-)
19 --- a/arch/arm/mach-orion5x/dns323-setup.c
20 +++ b/arch/arm/mach-orion5x/dns323-setup.c
22 /* Setup basic Orion functions. Need to be called early. */
25 - /* DNS-323 has a Marvell 88X7042 SATA controller attached via PCIe
27 - * Open a special address decode windows for the PCIe WA.
29 - orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
30 - ORION5X_PCIE_WA_SIZE);
32 /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */
33 orion5x_write(MPP_0_7_CTRL, 0);
34 orion5x_write(MPP_8_15_CTRL, 0);
35 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
36 +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
41 - * Open a special address decode windows for the PCIe WA.
43 - orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
44 - ORION5X_PCIE_WA_SIZE);
47 * Setup Multiplexing Pins --
50 --- a/arch/arm/mach-orion5x/pci.c
51 +++ b/arch/arm/mach-orion5x/pci.c
53 if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
54 printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config "
55 "read transaction workaround\n");
56 + orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
57 + ORION5X_PCIE_WA_SIZE);
58 pcie_ops.read = pcie_rd_conf_wa;
61 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c
62 +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
67 - * Open a special address decode windows for the PCIe WA.
69 - orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
70 - ORION5X_PCIE_WA_SIZE);
73 * Setup Multiplexing Pins --
74 * MPP[0] Debug Led (GPIO - Out)
75 * MPP[1] Debug Led (GPIO - Out)
76 --- a/arch/arm/mach-orion5x/ts209-setup.c
77 +++ b/arch/arm/mach-orion5x/ts209-setup.c
82 - * Open a special address decode windows for the PCIe WA.
84 - orion5x_setup_pcie_wa_win(ORION5X_PCIE_WA_PHYS_BASE,
85 - ORION5X_PCIE_WA_SIZE);
88 * Setup Multiplexing Pins --
90 * MPP[1] USB copy button (0 active)