diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 17:09:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-10 17:09:44 -0500 |
commit | 0eccf60bfa9190d1588b2bf07d23d7b9b3a19d9e (patch) | |
tree | 6198378343c1856ecbf1d41e52683112f940bbc2 /arch/arm/mach-orion/dns323-setup.c | |
parent | b6ce068a1285a24185b01be8a49021827516b3e1 (diff) | |
parent | f9166e736e516a4b1de16577b5428afd0cffe325 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
[ARM] constify function pointer tables
[ARM] 4823/1: AT91 section fix
[ARM] 4824/1: pxa: clear RDH bit after any reset
[ARM] pxa: remove debugging PM: printk
ARM: OMAP1: Misc clean-up
ARM: OMAP1: Update defconfigs for omap1
ARM: OMAP1: Palm Tungsten E board clean-up
ARM: OMAP1: Use I2C bus registration helper for omap1
ARM: OMAP1: Remove omap_sram_idle()
ARM: OMAP1: PM fixes for OMAP1
ARM: OMAP1: Use MMC multislot structures for Siemens SX1 board
ARM: OMAP1: Make omap1 use MMC multislot structures
ARM: OMAP1: Change the comments to C style
ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
ARM: OMAP: Add helper module for board specific I2C bus registration
ARM: OMAP: Add dmtimer support for OMAP3
ARM: OMAP: Pre-3430 clean-up for dmtimer.c
ARM: OMAP: Add DMA support for chaining and 3430
ARM: OMAP: Add 24xx GPIO debounce support
ARM: OMAP: Get rid of unnecessary ifdefs in GPIO code
...
Diffstat (limited to 'arch/arm/mach-orion/dns323-setup.c')
-rw-r--r-- | arch/arm/mach-orion/dns323-setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-orion/dns323-setup.c b/arch/arm/mach-orion/dns323-setup.c index c8a806f249c6..02b280c24820 100644 --- a/arch/arm/mach-orion/dns323-setup.c +++ b/arch/arm/mach-orion/dns323-setup.c | |||
@@ -259,8 +259,8 @@ static void __init dns323_init(void) | |||
259 | * | 259 | * |
260 | * Open a special address decode windows for the PCIE WA. | 260 | * Open a special address decode windows for the PCIE WA. |
261 | */ | 261 | */ |
262 | orion_write(ORION_REGS_BASE | 0x20074, ORION_PCIE_WA_BASE); | 262 | orion_write(ORION_REGS_VIRT_BASE | 0x20074, ORION_PCIE_WA_PHYS_BASE); |
263 | orion_write(ORION_REGS_BASE | 0x20070, | 263 | orion_write(ORION_REGS_VIRT_BASE | 0x20070, |
264 | (0x7941 | (((ORION_PCIE_WA_SIZE >> 16) - 1)) << 16)); | 264 | (0x7941 | (((ORION_PCIE_WA_SIZE >> 16) - 1)) << 16)); |
265 | 265 | ||
266 | /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */ | 266 | /* set MPP to 0 as D-Link's 2.6.12.6 kernel did */ |
@@ -312,8 +312,8 @@ static void __init dns323_init(void) | |||
312 | /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */ | 312 | /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */ |
313 | MACHINE_START(DNS323, "D-Link DNS-323") | 313 | MACHINE_START(DNS323, "D-Link DNS-323") |
314 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ | 314 | /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */ |
315 | .phys_io = ORION_REGS_BASE, | 315 | .phys_io = ORION_REGS_PHYS_BASE, |
316 | .io_pg_offst = ((ORION_REGS_BASE) >> 18) & 0xFFFC, | 316 | .io_pg_offst = ((ORION_REGS_VIRT_BASE) >> 18) & 0xFFFC, |
317 | .boot_params = 0x00000100, | 317 | .boot_params = 0x00000100, |
318 | .init_machine = dns323_init, | 318 | .init_machine = dns323_init, |
319 | .map_io = orion_map_io, | 319 | .map_io = orion_map_io, |