diff options
author | Andrew Lunn <andrew@lunn.ch> | 2012-06-22 08:54:02 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 09:04:07 -0700 |
commit | cb739ad1bba5a996533cf381b9079a1e876d15bb (patch) | |
tree | 3b47028a08b2c5c5bfc2afc36225af0931a6ca52 /arch/arm/plat-orion | |
parent | 0bd3d94b39087298b88f7ee2570d1062e09e8dfd (diff) |
ARM: Orion: Fix Virtual/Physical mixup with watchdog
commit 0fa1f0609a0c1fe8b2be3c0089a2cb48f7fda521 upstream.
The orion watchdog is expecting to be passed the physcial address of
the hardware, and will ioremap() it to give a virtual address it will
use as the base address for the hardware. However, when creating the
platform resource record, a virtual address was being used.
Add the necassary #define's so we can pass the physical address as
expected.
Tested on Kirkwood and Orion5x.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r-- | arch/arm/plat-orion/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 74daf5ed1432..331f8bbded98 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -570,7 +570,7 @@ void __init orion_spi_1_init(unsigned long mapbase, static struct orion_wdt_platform_data orion_wdt_data; static struct resource orion_wdt_resource = - DEFINE_RES_MEM(TIMER_VIRT_BASE, 0x28); + DEFINE_RES_MEM(TIMER_PHYS_BASE, 0x28); static struct platform_device orion_wdt_device = { .name = "orion_wdt", |