From: John Crispin <john@openwrt.org>
Date: Tue, 16 Mar 2010 17:49:42 +0000 (+0000)
Subject: ifxmips - adds cf0001 swizzel patch, by/signed off Veli-Matti Valtonen (maligor)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=0fd413119987e4721598ffaf285506225b0654a9

ifxmips - adds cf0001 swizzel patch, by/signed off Veli-Matti Valtonen (maligor)

SVN-Revision: 20246
---

diff --git a/target/linux/ifxmips/patches-2.6.30/300-cfi-swap.patch b/target/linux/ifxmips/patches-2.6.30/300-cfi-swap.patch
deleted file mode 100644
index 109f958e7a..0000000000
--- a/target/linux/ifxmips/patches-2.6.30/300-cfi-swap.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: linux-2.6.30.5/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.30.5.orig/drivers/mtd/chips/cfi_cmdset_0002.c	2009-09-02 18:22:49.000000000 +0200
-+++ linux-2.6.30.5/drivers/mtd/chips/cfi_cmdset_0002.c	2009-09-02 18:31:31.000000000 +0200
-@@ -1090,7 +1090,9 @@
- 	int retry_cnt = 0;
- 
- 	adr += chip->start;
--
-+#ifdef CONFIG_IFXMIPS
-+	adr ^= 2;
-+#endif
- 	spin_lock(chip->mutex);
- 	ret = get_chip(map, chip, adr, FL_WRITING);
- 	if (ret) {
diff --git a/target/linux/ifxmips/patches-2.6.30/300-cfi0001-swap.patch b/target/linux/ifxmips/patches-2.6.30/300-cfi0001-swap.patch
new file mode 100644
index 0000000000..1a546a80b5
--- /dev/null
+++ b/target/linux/ifxmips/patches-2.6.30/300-cfi0001-swap.patch
@@ -0,0 +1,25 @@
+--- linux-2.6.30.5.orig/drivers/mtd/chips/cfi_cmdset_0001.c	2009-08-17 00:19:38.000000000 +0300
++++ linux-2.6.30.5/drivers/mtd/chips/cfi_cmdset_0001.c	2010-03-16 18:04:09.000000000 +0200
+@@ -41,7 +41,11 @@
+ /* #define CMDSET0001_DISABLE_WRITE_SUSPEND */
+ 
+ // debugging, turns off buffer write mode if set to 1
+-#define FORCE_WORD_WRITE 0
++#ifdef CONFIG_IFXMIPS
++#  define FORCE_WORD_WRITE 1
++#else
++#  define FORCE_WORD_WRITE 0
++#endif
+ 
+ #define MANUFACTURER_INTEL	0x0089
+ #define I82802AB	0x00ad
+@@ -1462,6 +1466,9 @@
+ 	int ret=0;
+ 
+ 	adr += chip->start;
++#ifdef CONFIG_IFXMIPS
++	adr ^= 2;
++#endif
+ 
+ 	switch (mode) {
+ 	case FL_WRITING:
diff --git a/target/linux/ifxmips/patches-2.6.30/310-cfi0002-swap.patch b/target/linux/ifxmips/patches-2.6.30/310-cfi0002-swap.patch
new file mode 100644
index 0000000000..109f958e7a
--- /dev/null
+++ b/target/linux/ifxmips/patches-2.6.30/310-cfi0002-swap.patch
@@ -0,0 +1,15 @@
+Index: linux-2.6.30.5/drivers/mtd/chips/cfi_cmdset_0002.c
+===================================================================
+--- linux-2.6.30.5.orig/drivers/mtd/chips/cfi_cmdset_0002.c	2009-09-02 18:22:49.000000000 +0200
++++ linux-2.6.30.5/drivers/mtd/chips/cfi_cmdset_0002.c	2009-09-02 18:31:31.000000000 +0200
+@@ -1090,7 +1090,9 @@
+ 	int retry_cnt = 0;
+ 
+ 	adr += chip->start;
+-
++#ifdef CONFIG_IFXMIPS
++	adr ^= 2;
++#endif
+ 	spin_lock(chip->mutex);
+ 	ret = get_chip(map, chip, adr, FL_WRITING);
+ 	if (ret) {