From fc35f54386655faec7483c691ca12c00c226a813 Mon Sep 17 00:00:00 2001 From: kaloz Date: Wed, 4 Jun 2008 13:51:17 +0000 Subject: add preliminary Marvell Orion support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11352 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...-move_setting_up_pcie_wa_window_into_pcie.patch | 90 ++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 target/linux/orion/patches/011-move_setting_up_pcie_wa_window_into_pcie.patch (limited to 'target/linux/orion/patches/011-move_setting_up_pcie_wa_window_into_pcie.patch') diff --git a/target/linux/orion/patches/011-move_setting_up_pcie_wa_window_into_pcie.patch b/target/linux/orion/patches/011-move_setting_up_pcie_wa_window_into_pcie.patch new file mode 100644 index 000000000..f6e78d84d --- /dev/null +++ b/target/linux/orion/patches/011-move_setting_up_pcie_wa_window_into_pcie.patch @@ -0,0 +1,90 @@ +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 +--- + arch/arm/mach-orion5x/dns323-setup.c | 7 ------- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 6 ------ + arch/arm/mach-orion5x/pci.c | 2 ++ + arch/arm/mach-orion5x/rd88f5182-setup.c | 6 ------ + arch/arm/mach-orion5x/ts209-setup.c | 6 ------ + 5 files changed, 2 insertions(+), 25 deletions(-) + +--- a/arch/arm/mach-orion5x/dns323-setup.c ++++ b/arch/arm/mach-orion5x/dns323-setup.c +@@ -247,13 +247,6 @@ + /* 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); +--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c ++++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c +@@ -188,12 +188,6 @@ + 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 +--- a/arch/arm/mach-orion5x/pci.c ++++ b/arch/arm/mach-orion5x/pci.c +@@ -152,6 +152,8 @@ + 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; + } + +--- a/arch/arm/mach-orion5x/rd88f5182-setup.c ++++ b/arch/arm/mach-orion5x/rd88f5182-setup.c +@@ -249,12 +249,6 @@ + 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) +--- a/arch/arm/mach-orion5x/ts209-setup.c ++++ b/arch/arm/mach-orion5x/ts209-setup.c +@@ -365,12 +365,6 @@ + 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) -- cgit v1.2.3