mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
71 lines
2.2 KiB
Diff
71 lines
2.2 KiB
Diff
|
From 39010a26a34a56a7928f9217ac23e5138c5ea952 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Crispin <blogic@openwrt.org>
|
||
|
|
Date: Mon, 15 Jul 2013 00:39:21 +0200
|
||
|
|
Subject: [PATCH 42/57] mtd: cfi cmdset 0002 force word write
|
||
|
|
|
||
|
|
---
|
||
|
|
drivers/mtd/chips/cfi_cmdset_0002.c | 9 +++++++--
|
||
|
|
1 file changed, 7 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||
|
|
@@ -40,7 +40,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
|
||
|
|
|
||
|
|
@@ -51,7 +51,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 *);
|
||
|
|
@@ -202,6 +204,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;
|
||
|
|
@@ -211,6 +214,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)
|
||
|
|
@@ -1789,6 +1793,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)
|
||
|
|
@@ -1917,7 +1922,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)
|
||
|
|
{
|
||
|
|
@@ -1992,6 +1996,7 @@ static int cfi_amdstd_write_buffers(stru
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
+#endif /* !FORCE_WORD_WRITE */
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Wait for the flash chip to become ready to write data
|