patch-2.4.0-test9 linux/arch/arm/mm/mm-tbox.c

• Lines: 72
• Date: Mon Sep 18 15:15:25 2000
• Orig file: v2.4.0-test8/linux/arch/arm/mm/mm-tbox.c
• Orig date: Fri Oct 29 11:42:57 1999

diff -u --recursive --new-file v2.4.0-test8/linux/arch/arm/mm/mm-tbox.c linux/arch/arm/mm/mm-tbox.c
@@ -1,13 +1,11 @@
 /*
- * arch/arm/mm/mm-tbox.c
- *  from arch/arm/mm/mm-ebsa110.c
+ *  linux/arch/arm/mm/mm-tbox.c
  *
- * Extra MM routines for the Tbox architecture
+ *  Copyright (C) 1998, 1999, 2000 Phil Blundell
+ *  Copyright (C) 1998-1999 Russell King
  *
- * Copyright (C) 1998 Phil Blundell
- * Copyright (C) 1998-1999 Russell King
+ *  Extra MM routines for the Tbox architecture
  */
-
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/init.h>
@@ -16,44 +14,15 @@
 #include <asm/pgtable.h>
 #include <asm/page.h>
 
-#include "map.h"
+#include <asm/mach/map.h>
  
-#define SIZE(x) (sizeof(x) / sizeof(x[0]))
-
-/*    Logical    Physical
- * 0xffff1000	0x00100000	DMA registers
- * 0xffff2000	0x00200000	MPEG
- * 0xffff3000	0x00300000	FPGA1 local control
- * 0xffff4000	0x00400000	External serial
- * 0xffff5000	0x00500000	Internal serial
- * 0xffff6000	0x00600000	Parallel
- * 0xffff7000	0x00700000	Interrupt control
- * 0xffff8000	0x00800000	Computer video
- * 0xffff9000	0x00900000	Control register 0
- * 0xffffs000	0x00a00000	Control register 1
- * 0xffffb000	0x00b00000	Control register 2
- * 0xffffc000	0x00c00000	FPGA2 local control
- * 0xffffd000	0x00d00000	Interrupt reset
- * 0xffffe000	0x00e00000	MPEG DMA throttle
- */
-
-const struct map_desc io_desc[] __initdata = {
-  	{ 0xffff0000, 0x01000000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff1000, 0x00100000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff2000, 0x00200000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff3000, 0x00300000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff4000, 0x00400000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xfe000000, 0x00400000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff5000, 0x00500000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff6000, 0x00600000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff7000, 0x00700000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff8000, 0x00800000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffff9000, 0x00900000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffffa000, 0x00a00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffffb000, 0x00b00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffffc000, 0x00c00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffffd000, 0x00d00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 },
- 	{ 0xffffe000, 0x00e00000, 0x00001000, DOMAIN_IO, 0, 1, 0, 0 }
+static struct map_desc tbox_io_desc[] __initdata = {
+	/* See hardware.h for details */
+	{ IO_BASE,	IO_START,	0x00100000, DOMAIN_IO, 0, 1, 0, 0 },
+	LAST_DESC
 };
 
-unsigned int __initdata io_desc_size = SIZE(io_desc);
+void __init tbox_map_io(void)
+{
+	iotable_init(tbox_io_desc);
+}