diff options
| author |   Lennert Buytenhek <buytenh@wantstofly.org> | 2008-03-27 14:51:40 -0400 |
|---|---|---|
| committer |   Nicolas Pitre <nico@marvell.com> | 2008-03-27 14:51:40 -0400 |
| commit | 98f79d1ea0459b907f95846bad5e967a06b7a0d5 (patch) | |
| tree | 2a9148e04a36f7cfdf1be90874b7b5eb84e7cf6e /arch/arm/mach-orion/ts209-setup.c | |
| parent | plat-orion: make orion_nand available for all Orion families (diff) | |
| download | linux-dev-98f79d1ea0459b907f95846bad5e967a06b7a0d5.tar.xz linux-dev-98f79d1ea0459b907f95846bad5e967a06b7a0d5.zip | |
Orion: revamp cpu mbus window handling
Instead of forcing all device bus window setup through one function
with some enum as the first argument, create separate window setup
functions for each of the four possible targets, and do the demux
internally. This allows getting rid of the window identifier enum
and the big switch statement in orion_setup_cpu_win().
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion/ts209-setup.c')
| -rw-r--r-- | arch/arm/mach-orion/ts209-setup.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-orion/ts209-setup.c b/arch/arm/mach-orion/ts209-setup.c index 86583e4856a1..8eca070006f1 100644 --- a/arch/arm/mach-orion/ts209-setup.c +++ b/arch/arm/mach-orion/ts209-setup.c @@ -288,15 +288,13 @@ static void __init qnap_ts209_init(void) /* * Setup flash mapping */ - orion_setup_cpu_win(ORION_DEV_BOOT, QNAP_TS209_NOR_BOOT_BASE, - QNAP_TS209_NOR_BOOT_SIZE, -1); + orion_setup_dev_boot_win(QNAP_TS209_NOR_BOOT_BASE, + QNAP_TS209_NOR_BOOT_SIZE); /* * Open a special address decode windows for the PCIE WA. */ - orion_write(ORION_REGS_VIRT_BASE | 0x20074, ORION_PCIE_WA_PHYS_BASE); - orion_write(ORION_REGS_VIRT_BASE | 0x20070, (0x7941 | - (((ORION_PCIE_WA_SIZE >> 16) - 1)) << 16)); + orion_setup_pcie_wa_win(ORION_PCIE_WA_PHYS_BASE, ORION_PCIE_WA_SIZE); /* * Setup Multiplexing Pins -- |