[Netnice-commitlog] netnice : Linux/arch/arm/mach-h720x common.c,1.1.1.1,1.1.1.1.6.1 cpu-h7201.c,1.1.1.1,1.1.1.1.6.1 cpu-h7202.c,1.1.1.1,1.1.1.1.6.1 h7201-eval.c,1.1.1.1,1.1.1.1.6.1 h7202-eval.c,1.1.1.1,1.1.1.1.6.1

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

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

Modified Files:
      Tag: netnice2615
	common.c cpu-h7201.c cpu-h7202.c h7201-eval.c h7202-eval.c 
Log Message:
netnice patch updated to linux kernel 2.6.15.
--Kartikey BHATT



Index: h7202-eval.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-h720x/h7202-eval.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -d -r1.1.1.1 -r1.1.1.1.6.1
--- h7202-eval.c	5 Nov 2005 19:52:59 -0000	1.1.1.1
+++ h7202-eval.c	16 Feb 2006 10:13:15 -0000	1.1.1.1.6.1
@@ -18,7 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/setup.h>
 #include <asm/types.h>
@@ -71,11 +71,13 @@
 }
 
 MACHINE_START(H7202, "Hynix HMS30C7202")
-	MAINTAINER("Robert Schwebel, Pengutronix")
-	BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
-	BOOT_PARAMS(0x40000100)
-	MAPIO(h720x_map_io)
-	INITIRQ(h7202_init_irq)
-	.timer = &h7202_timer,
-	INIT_MACHINE(init_eval_h7202)
+	/* Maintainer: Robert Schwebel, Pengutronix */
+	.phys_ram	= 0x40000000,
+	.phys_io	= 0x80000000,
+	.io_pg_offst	= ((0xf0000000) >> 18) & 0xfffc,
+	.boot_params	= 0x40000100,
+	.map_io		= h720x_map_io,
+	.init_irq	= h7202_init_irq,
+	.timer		= &h7202_timer,
+	.init_machine	= init_eval_h7202,
 MACHINE_END

Index: common.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-h720x/common.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -d -r1.1.1.1 -r1.1.1.1.6.1
--- common.c	5 Nov 2005 19:52:58 -0000	1.1.1.1
+++ common.c	16 Feb 2006 10:13:15 -0000	1.1.1.1.6.1
@@ -108,7 +108,7 @@
 	while (mask) {
 		if (mask & 1) {
 			IRQDBG("handling irq %d\n", irq);
-			desc->handle(irq, desc, regs);
+			desc_handle_irq(irq, desc, regs);
 		}
 		irq++;
 		desc++;
@@ -237,7 +237,12 @@
 }
 
 static struct map_desc h720x_io_desc[] __initdata = {
-	{ IO_VIRT, IO_PHYS, IO_SIZE, MT_DEVICE },
+	{
+		.virtual	= IO_VIRT,
+		.pfn		= __phys_to_pfn(IO_PHYS),
+		.length		= IO_SIZE,
+		.type		= MT_DEVICE
+	},
 };
 
 /* Initialize io tables */

Index: cpu-h7201.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-h720x/cpu-h7201.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -d -r1.1.1.1 -r1.1.1.1.6.1
--- cpu-h7201.c	5 Nov 2005 19:52:58 -0000	1.1.1.1
+++ cpu-h7201.c	16 Feb 2006 10:13:15 -0000	1.1.1.1.6.1
@@ -41,8 +41,8 @@
 
 static struct irqaction h7201_timer_irq = {
 	.name		= "h7201 Timer Tick",
-	.flags		= SA_INTERRUPT,
-	.handler	= h7201_timer_interrupt
+	.flags		= SA_INTERRUPT | SA_TIMER,
+	.handler	= h7201_timer_interrupt,
 };
 
 /*

Index: cpu-h7202.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-h720x/cpu-h7202.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -d -r1.1.1.1 -r1.1.1.1.6.1
--- cpu-h7202.c	5 Nov 2005 19:52:58 -0000	1.1.1.1
+++ cpu-h7202.c	16 Feb 2006 10:13:15 -0000	1.1.1.1.6.1
@@ -90,7 +90,7 @@
 
 static struct platform_device serial_device = {
 	.name			= "serial8250",
-	.id			= 0,
+	.id			= PLAT8250_DEV_PLATFORM,
 	.dev			= {
 		.platform_data	= serial_platform_data,
 	},
@@ -126,7 +126,7 @@
 	desc = irq_desc + irq;
 	while (mask) {
 		if (mask & 1)
-			desc->handle(irq, desc, regs);
+			desc_handle_irq(irq, desc, regs);
 		irq++;
 		desc++;
 		mask >>= 1;
@@ -171,8 +171,8 @@
 
 static struct irqaction h7202_timer_irq = {
 	.name		= "h7202 Timer Tick",
-	.flags		= SA_INTERRUPT,
-	.handler	= h7202_timer_interrupt
+	.flags		= SA_INTERRUPT | SA_TIMER,
+	.handler	= h7202_timer_interrupt,
 };
 
 /*

Index: h7201-eval.c
===================================================================
RCS file: /cvsroot/netnice/Linux/arch/arm/mach-h720x/h7201-eval.c,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.6.1
diff -u -d -r1.1.1.1 -r1.1.1.1.6.1
--- h7201-eval.c	5 Nov 2005 19:52:58 -0000	1.1.1.1
+++ h7201-eval.c	16 Feb 2006 10:13:15 -0000	1.1.1.1.6.1
@@ -30,10 +30,12 @@
 #include "common.h"
 
 MACHINE_START(H7201, "Hynix GMS30C7201")
-	MAINTAINER("Robert Schwebel, Pengutronix")
-	BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
-	BOOT_PARAMS(0xc0001000)
-	MAPIO(h720x_map_io)
-	INITIRQ(h720x_init_irq)
-	.timer = &h7201_timer,
+	/* Maintainer: Robert Schwebel, Pengutronix */
+	.phys_ram	= 0x40000000,
+	.phys_io	= 0x80000000,
+	.io_pg_offst	= ((0xf0000000) >> 18) & 0xfffc,
+	.boot_params	= 0xc0001000,
+	.map_io		= h720x_map_io,
+	.init_irq	= h720x_init_irq,
+	.timer		= &h7201_timer,
 MACHINE_END