From d2dc408c32d09ceced141730040cd6f4a8ca4f3c Mon Sep 17 00:00:00 2001 From: Deepak Saxena Date: Fri, 28 Oct 2005 15:18:56 +0100 Subject: [PATCH] --- yaml --- r: 10419 b: refs/heads/master c: f70cd65658388ca2a06071bdbd8a5a6beac5aa47 h: refs/heads/master i: 10417: c42dd3533a6957844248ee0be9188adb39bf8865 10415: f4375bb85022117d4c147e3fd840f2589921fb1c v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-aaec2000/core.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6200cac713b6..7e8b9739a267 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6b9dafce3e3b434a3e7ffd5072815c03d18cc84 +refs/heads/master: f70cd65658388ca2a06071bdbd8a5a6beac5aa47 diff --git a/trunk/arch/arm/mach-aaec2000/core.c b/trunk/arch/arm/mach-aaec2000/core.c index aece0cd4f0a3..9be6c3213254 100644 --- a/trunk/arch/arm/mach-aaec2000/core.c +++ b/trunk/arch/arm/mach-aaec2000/core.c @@ -40,9 +40,17 @@ * default mapping provided here. */ static struct map_desc standard_io_desc[] __initdata = { - /* virtual physical length type */ - { VIO_APB_BASE, PIO_APB_BASE, IO_APB_LENGTH, MT_DEVICE }, - { VIO_AHB_BASE, PIO_AHB_BASE, IO_AHB_LENGTH, MT_DEVICE } + { + .virtual = VIO_APB_BASE, + .physical = __phys_to_pfn(PIO_APB_BASE), + .length = IO_APB_LENGTH, + .type = MT_DEVICE + }, { + .virtual = VIO_AHB_BASE, + .physical = __phys_to_pfn(PIO_AHB_BASE), + .length = IO_AHB_LENGTH, + .type = MT_DEVICE + } }; void __init aaec2000_map_io(void)