mtd/drivers/mtd/maps sa1100-flash.c,1.39,1.40

[joshua at infradead.org]

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

Modified Files:
	sa1100-flash.c 
Log Message:
Merged in some changes to sa1100-flash.c from handhelds.org's repository

Index: sa1100-flash.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/maps/sa1100-flash.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sa1100-flash.c	12 Jul 2004 21:59:44 -0000	1.39
+++ sa1100-flash.c	24 Aug 2004 18:52:05 -0000	1.40
@@ -496,6 +496,32 @@
 };
 #endif
 
+#ifdef CONFIG_SA1100_JORNADA56X
+static struct mtd_partition jornada56x_partitions[] = {
+	{
+		.name		= "bootldr",
+		.size		= 0x00040000,
+		.offset		= 0,
+		.mask_flags	= MTD_WRITEABLE,
+	}, {
+		.name		= "rootfs",
+		.size		= MTDPART_SIZ_FULL,
+		.offset		= MTDPART_OFS_APPEND,
+	}
+};
+
+static void jornada56x_set_vpp(struct map_info *map, int vpp)
+{
+	if (vpp)
+		GPSR = GPIO_GPIO26;
+	else
+		GPCR = GPIO_GPIO26;
+	GPDR |= GPIO_GPIO26;
+}
+#else
+#define jornada56x_set_vpp NULL
+#endif
+
 #ifdef CONFIG_SA1100_JORNADA720
 static struct mtd_partition jornada720_partitions[] = {
 	{
@@ -822,6 +848,12 @@
 		nb_parts     = ARRAY_SIZE(huw_webpanel_partitions);
 	}
 #endif
+#ifdef CONFIG_SA1100_JORNADA56X
+	if (machine_is_jornada56x()) {
+		*parts       = jornada56x_partitions;
+		nb_parts     = ARRAY_SIZE(jornada56x_partitions);
+	}
+#endif
 #ifdef CONFIG_SA1100_JORNADA720
 	if (machine_is_jornada720()) {
 		*parts       = jornada720_partitions;
@@ -1160,7 +1192,7 @@
 		info[0].size = SZ_16M;
 		nr = 1;
 	}
-	if (machine_is_h3xxx()) {
+	if (machine_is_ipaq()) {
 		info[0].set_vpp = h3xxx_set_vpp;
 		info[0].base = SA1100_CS0_PHYS;
 		info[0].size = SZ_32M;
@@ -1176,6 +1208,12 @@
 		info[0].size = SZ_32M;
 		nr = 1;
 	}
+	if (machine_is_jornada56x()) {
+		info[0].set_vpp = jornada56x_set_vpp;
+		info[0].base = SA1100_CS0_PHYS;
+		info[0].size = SZ_32M;
+		nr = 1;
+	}
 	if (machine_is_jornada720()) {
 		info[0].set_vpp = jornada720_set_vpp;
 		info[0].base = SA1100_CS0_PHYS;