diff options
Diffstat (limited to 'arch/arm/mach-orion/ts209-setup.c')
-rw-r--r-- | arch/arm/mach-orion/ts209-setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-orion/ts209-setup.c b/arch/arm/mach-orion/ts209-setup.c index e3e930efd15..8edb2ac0966 100644 --- a/arch/arm/mach-orion/ts209-setup.c +++ b/arch/arm/mach-orion/ts209-setup.c | |||
@@ -244,7 +244,7 @@ static struct platform_device *qnap_ts209_devices[] __initdata = { | |||
244 | * QNAP TS-[12]09 specific power off method via UART1-attached PIC | 244 | * QNAP TS-[12]09 specific power off method via UART1-attached PIC |
245 | */ | 245 | */ |
246 | 246 | ||
247 | #define UART1_REG(x) (UART1_BASE + ((UART_##x) << 2)) | 247 | #define UART1_REG(x) (UART1_VIRT_BASE + ((UART_##x) << 2)) |
248 | 248 | ||
249 | static void qnap_ts209_power_off(void) | 249 | static void qnap_ts209_power_off(void) |
250 | { | 250 | { |
@@ -282,8 +282,8 @@ static void __init qnap_ts209_init(void) | |||
282 | /* | 282 | /* |
283 | * Open a special address decode windows for the PCIE WA. | 283 | * Open a special address decode windows for the PCIE WA. |
284 | */ | 284 | */ |
285 | orion_write(ORION_REGS_BASE | 0x20074, ORION_PCIE_WA_BASE); | 285 | orion_write(ORION_REGS_VIRT_BASE | 0x20074, ORION_PCIE_WA_PHYS_BASE); |
286 | orion_write(ORION_REGS_BASE | 0x20070, (0x7941 | | 286 | orion_write(ORION_REGS_VIRT_BASE | 0x20070, (0x7941 | |
287 | (((ORION_PCIE_WA_SIZE >> 16) - 1)) << 16)); | 287 | (((ORION_PCIE_WA_SIZE >> 16) - 1)) << 16)); |
288 | 288 | ||
289 | /* | 289 | /* |
@@ -325,8 +325,8 @@ static void __init qnap_ts209_init(void) | |||
325 | 325 | ||
326 | MACHINE_START(TS209, "QNAP TS-109/TS-209") | 326 | MACHINE_START(TS209, "QNAP TS-109/TS-209") |
327 | /* Maintainer: Byron Bradley <byron.bbradley@gmail.com> */ | 327 | /* Maintainer: Byron Bradley <byron.bbradley@gmail.com> */ |
328 | .phys_io = ORION_REGS_BASE, | 328 | .phys_io = ORION_REGS_PHYS_BASE, |
329 | .io_pg_offst = ((ORION_REGS_BASE) >> 18) & 0xFFFC, | 329 | .io_pg_offst = ((ORION_REGS_VIRT_BASE) >> 18) & 0xFFFC, |
330 | .boot_params = 0x00000100, | 330 | .boot_params = 0x00000100, |
331 | .init_machine = qnap_ts209_init, | 331 | .init_machine = qnap_ts209_init, |
332 | .map_io = orion_map_io, | 332 | .map_io = orion_map_io, |