summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch
diff options
context:
space:
mode:
authoracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-21 11:45:23 +0000
committeracoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-04-21 11:45:23 +0000
commitdfba2f5fb19c96511b4f389a65492be66b908f07 (patch)
tree912dc32f5b0f567d85207f81071f02a9f36f6f28 /target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch
parente7a09675219049d52769218ee228b5b5d9bea5dd (diff)
linux/ar71xx: add 2.6.38 preliminary support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26746 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch')
-rw-r--r--target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch
new file mode 100644
index 0000000000..80846055b5
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.38/111-mtd-cfi_cmdset_0002-force-word-write.patch
@@ -0,0 +1,61 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -39,7 +39,7 @@
+ #include <linux/mtd/xip.h>
+
+ #define AMD_BOOTLOC_BUG
+-#define FORCE_WORD_WRITE 0
++#define FORCE_WORD_WRITE 1
+
+ #define MAX_WORD_RETRIES 3
+
+@@ -50,7 +50,9 @@
+
+ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
+ static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
++#if !FORCE_WORD_WRITE
+ static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
++#endif
+ static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
+ static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
+ static void cfi_amdstd_sync (struct mtd_info *);
+@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m
+ }
+ #endif
+
++#if !FORCE_WORD_WRITE
+ static void fixup_use_write_buffers(struct mtd_info *mtd)
+ {
+ struct map_info *map = mtd->priv;
+@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru
+ mtd->write = cfi_amdstd_write_buffers;
+ }
+ }
++#endif /* !FORCE_WORD_WRITE */
+
+ /* Atmel chips don't use the same PRI format as AMD chips */
+ static void fixup_convert_atmel_pri(struct mtd_info *mtd)
+@@ -1378,6 +1382,7 @@ static int cfi_amdstd_write_words(struct
+ /*
+ * FIXME: interleaved mode not tested, and probably not supported!
+ */
++#if !FORCE_WORD_WRITE
+ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
+ unsigned long adr, const u_char *buf,
+ int len)
+@@ -1488,7 +1493,6 @@ static int __xipram do_write_buffer(stru
+ return ret;
+ }
+
+-
+ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
+ size_t *retlen, const u_char *buf)
+ {
+@@ -1567,6 +1571,7 @@ static int cfi_amdstd_write_buffers(stru
+
+ return 0;
+ }
++#endif /* !FORCE_WORD_WRITE */
+
+ /*
+ * Handle devices with one erase region, that only implement