mtd/drivers/mtd/chips Kconfig, 1.15, 1.16 cfi_cmdset_0001.c, 1.178, 1.179 cfi_cmdset_0002.c, 1.118, 1.119

[gleixner at infradead.org]

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

Modified Files:
	Kconfig cfi_cmdset_0001.c cfi_cmdset_0002.c 
Log Message:
XIP cleanup, sync with upstream mtd.git code

Index: Kconfig
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/Kconfig,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Kconfig	6 Jun 2005 23:04:35 -0000	1.15
+++ Kconfig	11 Jul 2005 09:37:59 -0000	1.16
@@ -300,7 +300,7 @@
 
 config MTD_XIP
 	bool "XIP aware MTD support"
-	depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL
+	depends on !SMP && (MTD_CFI_INTELEXT || MTD_CFI_AMDSTD) && EXPERIMENTAL && (ARM || ARM26)
 	default y if XIP_KERNEL
 	help
 	  This allows MTD support to work with flash memory which is also

Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- cfi_cmdset_0001.c	19 May 2005 17:05:43 -0000	1.178
+++ cfi_cmdset_0001.c	11 Jul 2005 09:37:59 -0000	1.179
@@ -845,7 +845,7 @@
 		chip->state = FL_READY;
 	}
 	(void) map_read(map, adr);
-	asm volatile (".rep 8; nop; .endr"); /* fill instruction prefetch */
+	xip_iprefetch();
 	local_irq_enable();
 }
 

Index: cfi_cmdset_0002.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0002.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- cfi_cmdset_0002.c	4 Jul 2005 22:34:29 -0000	1.118
+++ cfi_cmdset_0002.c	11 Jul 2005 09:38:00 -0000	1.119
@@ -600,7 +600,7 @@
 		chip->state = FL_READY;
 	}
 	(void) map_read(map, adr);
-	asm volatile (".rep 8; nop; .endr"); /* fill instruction prefetch */
+	xip_iprefetch();
 	local_irq_enable();
 }