[Netnice-commitlog] netnice : Linux/arch/arm/mach-epxa10db arch.c,1.1.1.2,1.1.1.2.6.1 mm.c,1.1.1.1,1.1.1.1.8.1 time.c,1.1.1.2,1.1.1.2.6.1

[bhatt k. m. <rou...@us...>]

Update of /cvsroot/netnice/Linux/arch/arm/mach-epxa10db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2102/mach-epxa10db

Modified Files:
      Tag: netnice2615
	arch.c mm.c time.c 
Log Message:
netnice patch updated to linux kernel 2.6.15.
--Kartikey BHATT



Index: time.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-epxa10db/time.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.6.1
diff -u -d -r1.1.1.2 -r1.1.1.2.6.1
--- time.c	5 Nov 2005 19:52:56 -0000	1.1.1.2
+++ time.c	16 Feb 2006 10:13:14 -0000	1.1.1.2.6.1
@@ -56,8 +56,8 @@
 
 static struct irqaction epxa10db_timer_irq = {
 	.name		= "Excalibur Timer Tick",
-	.flags		= SA_INTERRUPT,
-	.handler	= epxa10db_timer_interrupt
+	.flags		= SA_INTERRUPT | SA_TIMER,
+	.handler	= epxa10db_timer_interrupt,
 };
 
 /*

Index: arch.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-epxa10db/arch.c,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.6.1
diff -u -d -r1.1.1.2 -r1.1.1.2.6.1
--- arch.c	5 Nov 2005 19:52:56 -0000	1.1.1.2
+++ arch.c	16 Feb 2006 10:13:14 -0000	1.1.1.2.6.1
@@ -52,7 +52,7 @@
 
 static struct platform_device serial_device = {
 	.name			= "serial8250",
-	.id			= 0,
+	.id			= PLAT8250_DEV_PLATFORM,
 	.dev			= {
 		.platform_data	= serial_platform_data,
 	},
@@ -63,10 +63,12 @@
 extern struct sys_timer epxa10db_timer;
 
 MACHINE_START(CAMELOT, "Altera Epxa10db")
-	MAINTAINER("Altera Corporation")
-	BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000)
-	MAPIO(epxa10db_map_io)
-	INITIRQ(epxa10db_init_irq)
+	/* Maintainer: Altera Corporation */
+	.phys_ram	= 0x00000000,
+	.phys_io	= 0x7fffc000,
+	.io_pg_offst	= ((0xffffc000) >> 18) & 0xfffc,
+	.map_io		= epxa10db_map_io,
+	.init_irq	= epxa10db_init_irq,
 	.timer		= &epxa10db_timer,
 MACHINE_END
 

Index: mm.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-epxa10db/mm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.8.1
diff -u -d -r1.1.1.1 -r1.1.1.1.8.1
--- mm.c	13 Jul 2004 07:19:36 -0000	1.1.1.1
+++ mm.c	16 Feb 2006 10:13:14 -0000	1.1.1.1.8.1
@@ -25,18 +25,44 @@
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
+#include <asm/page.h>
  
 #include <asm/mach/map.h>
 
 /* Page table mapping for I/O region */
  
 static struct map_desc epxa10db_io_desc[] __initdata = {
- { IO_ADDRESS(EXC_REGISTERS_BASE),   EXC_REGISTERS_BASE,    SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK0_BASE),  EXC_PLD_BLOCK0_BASE,   SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK1_BASE),  EXC_PLD_BLOCK1_BASE,   SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK2_BASE),  EXC_PLD_BLOCK2_BASE,   SZ_16K, MT_DEVICE }, 
- { IO_ADDRESS(EXC_PLD_BLOCK3_BASE),  EXC_PLD_BLOCK3_BASE,   SZ_16K, MT_DEVICE }, 
- { FLASH_VADDR(EXC_EBI_BLOCK0_BASE), EXC_EBI_BLOCK0_BASE,   SZ_16M, MT_DEVICE }
+	{
+		.virtual	= IO_ADDRESS(EXC_REGISTERS_BASE),
+		.pfn		= __phys_to_pfn(EXC_REGISTERS_BASE),
+		.length		= SZ_16K,
+		.type		= MT_DEVICE
+	}, {
+		.virtual	= IO_ADDRESS(EXC_PLD_BLOCK0_BASE),
+		.pfn		= __phys_to_pfn(EXC_PLD_BLOCK0_BASE),
+		.length		= SZ_16K,
+		.type		= MT_DEVICE
+	}, {
+		.virtual	= IO_ADDRESS(EXC_PLD_BLOCK1_BASE),
+		.pfn		=__phys_to_pfn(EXC_PLD_BLOCK1_BASE),
+		.length		= SZ_16K,
+		.type		= MT_DEVICE
+	}, {
+		.virtual	= IO_ADDRESS(EXC_PLD_BLOCK2_BASE),
+		.physical	= __phys_to_pfn(EXC_PLD_BLOCK2_BASE),
+		.length		= SZ_16K,
+		.type		= MT_DEVICE
+	}, {
+		.virtual	= IO_ADDRESS(EXC_PLD_BLOCK3_BASE),
+		.pfn		= __phys_to_pfn(EXC_PLD_BLOCK3_BASE),
+		.length		= SZ_16K,
+		.type		= MT_DEVICE
+	}, {
+		.virtual	= FLASH_VADDR(EXC_EBI_BLOCK0_BASE),
+		.pfn		= __phys_to_pfn(EXC_EBI_BLOCK0_BASE),
+		.length		= SZ_16M,
+		.type		= MT_DEVICE
+	}
 };
 
 void __init epxa10db_map_io(void)