mtd/drivers/mtd/maps sa1100-flash.c,1.37,1.38

[Russell King]

Update of /home/cvs/mtd/drivers/mtd/maps
In directory phoenix.infradead.org:/tmp/cvs-serv14600

Modified Files:
	sa1100-flash.c 
Log Message:
[ARM PATCH] 1653/1: Simpad Flash Partition resubmit

Patch from: Holger Freyther

This the the resubmit of the flash partition changes for SIMpad.

Two versions one for cramfs one for all jffs2 and also the SIM has two
banks instead of one even if they're next to each other... 


Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- sa1100-flash.c	22 Jan 2004 19:09:25 -0000	1.37
+++ sa1100-flash.c	22 Jan 2004 19:11:08 -0000	1.38
@@ -638,28 +638,21 @@
 	}, {
 		.name		= "SIMpad kernel",
 		.size		= 0x00100000,
-		.offset		= 0x00080000,
-	}, {
-#ifdef CONFIG_JFFS2_FS
-		.name		= "SIMpad root jffs2",
-		.size		= MTDPART_SIZ_FULL,
-		.offset		= 0x00180000,
-#else
-		.name		= "SIMpad initrd",
-		.size		= 0x00300000,
-		.offset		= 0x00180000,
+		.offset		= MTDPART_OFS_APPEND,
 	}, {
+#ifdef CONFIG_ROOT_CRAMFS
 		.name		= "SIMpad root cramfs",
-		.size		= 0x00300000,
-		.offset		= 0x00480000,
-	}, {
-		.name		= "SIMpad usr cramfs",
-		.size		= 0x005c0000,
-		.offset		= 0x00780000,
+		.size	     	=0x00D80000,
+		.offset		= MTDPART_OFS_APPEND
+
 	}, {
-		.name		= "SIMpad usr local",
+		.name		= "SIMpad local jffs2",
+		.size		= MTDPART_SIZ_FULL,
+		.offset		= MTDPART_OFS_APPEND
+#else
+		.name		= "SIMpad root jffs2",
 		.size		= MTDPART_SIZ_FULL,
-		.offset		= 0x00d40000,
+		.offset		= MTDPART_OFS_APPEND
 #endif
 	}
 };
@@ -1228,8 +1221,10 @@
 	}
 	if (machine_is_simpad()) {
 		info[0].base = SA1100_CS0_PHYS;
-		info[0].size = SZ_32M;
-		nr = 1;
+		info[0].size = SZ_16M;
+		info[1].base = SA1100_CS1_PHYS;
+		info[1].size = SZ_16M;
+		nr = 2;
 	}
 	if (machine_is_stork()) {
 		info[0].base = SA1100_CS0_PHYS;