From 4b5d5e5d64217c2dd976b0eb8eb834392f00fa56 Mon Sep 17 00:00:00 2001
From: Andrew Victor <andrew@sanpeople.com>
Date: Mon, 19 Jun 2006 15:26:51 +0100
Subject: [PATCH] --- yaml --- r: 28088 b: refs/heads/master c:
 10e8e1fb758eed5cfb0cae1b770f842624851e7b h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/arm/mach-at91rm9200/common.c          | 6 ++++++
 trunk/include/asm-arm/arch-at91rm9200/hardware.h | 5 ++++-
 trunk/include/asm-arm/arch-at91rm9200/vmalloc.h  | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ab1fc10a57f7..159b7f939305 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a6f9902c6a799a9c0218b37e39b75690c3b9a70
+refs/heads/master: 10e8e1fb758eed5cfb0cae1b770f842624851e7b
diff --git a/trunk/arch/arm/mach-at91rm9200/common.c b/trunk/arch/arm/mach-at91rm9200/common.c
index 3848fd2d5596..40d29a73b5c5 100644
--- a/trunk/arch/arm/mach-at91rm9200/common.c
+++ b/trunk/arch/arm/mach-at91rm9200/common.c
@@ -17,6 +17,7 @@
 #include <asm/mach/map.h>
 
 #include <asm/arch/hardware.h>
+#include "generic.h"
 
 static struct map_desc at91rm9200_io_desc[] __initdata = {
 	{
@@ -94,6 +95,11 @@ static struct map_desc at91rm9200_io_desc[] __initdata = {
 		.pfn		= __phys_to_pfn(AT91_BASE_TCB0),
 		.length		= SZ_16K,
 		.type		= MT_DEVICE,
+	}, {
+		.virtual	= AT91_SRAM_VIRT_BASE,
+		.pfn		= __phys_to_pfn(AT91_SRAM_BASE),
+		.length		= AT91_SRAM_SIZE,
+		.type		= MT_DEVICE,
 	},
 };
 
diff --git a/trunk/include/asm-arm/arch-at91rm9200/hardware.h b/trunk/include/asm-arm/arch-at91rm9200/hardware.h
index 59e6f44d3a0d..87f40df57140 100644
--- a/trunk/include/asm-arm/arch-at91rm9200/hardware.h
+++ b/trunk/include/asm-arm/arch-at91rm9200/hardware.h
@@ -50,9 +50,12 @@
 #define AT91_VA_BASE_TCB0	AT91_IO_P2V(AT91_BASE_TCB0)
 
 /* Internal SRAM */
-#define AT91_BASE_SRAM		0x00200000	/* Internal SRAM base address */
+#define AT91_SRAM_BASE		0x00200000	/* Internal SRAM base address */
 #define AT91_SRAM_SIZE		0x00004000	/* Internal SRAM SIZE (16Kb) */
 
+ /* Internal SRAM is mapped below the IO devices */
+#define AT91_SRAM_VIRT_BASE	(AT91_IO_VIRT_BASE - AT91_SRAM_SIZE)
+
 /* Serial ports */
 #define AT91_NR_UART		5		/* 4 USART3's and one DBGU port */
 
diff --git a/trunk/include/asm-arm/arch-at91rm9200/vmalloc.h b/trunk/include/asm-arm/arch-at91rm9200/vmalloc.h
index 34d9718feb90..4c367eb57f47 100644
--- a/trunk/include/asm-arm/arch-at91rm9200/vmalloc.h
+++ b/trunk/include/asm-arm/arch-at91rm9200/vmalloc.h
@@ -21,6 +21,6 @@
 #ifndef __ASM_ARCH_VMALLOC_H
 #define __ASM_ARCH_VMALLOC_H
 
-#define VMALLOC_END		(AT91_IO_VIRT_BASE & PGDIR_MASK)
+#define VMALLOC_END		(AT91_SRAM_VIRT_BASE & PGDIR_MASK)
 
 #endif