|
|
@ -1,6 +1,6 @@ |
|
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
|
|
|
|
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
|
|
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
|
|
|
|
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
|
|
|
|
@@ -1008,7 +1008,7 @@
|
|
|
|
@@ -1010,7 +1010,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
static int __xipram xip_wait_for_operation(
|
|
|
|
static int __xipram xip_wait_for_operation(
|
|
|
|
struct map_info *map, struct flchip *chip,
|
|
|
|
struct map_info *map, struct flchip *chip,
|
|
|
@ -9,7 +9,7 @@ |
|
|
|
{
|
|
|
|
{
|
|
|
|
struct cfi_private *cfi = map->fldrv_priv;
|
|
|
|
struct cfi_private *cfi = map->fldrv_priv;
|
|
|
|
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
|
|
|
|
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
|
|
|
|
@@ -1017,7 +1017,7 @@
|
|
|
|
@@ -1019,7 +1019,7 @@
|
|
|
|
flstate_t oldstate, newstate;
|
|
|
|
flstate_t oldstate, newstate;
|
|
|
|
|
|
|
|
|
|
|
|
start = xip_currtime();
|
|
|
|
start = xip_currtime();
|
|
|
@ -18,7 +18,7 @@ |
|
|
|
if (usec == 0)
|
|
|
|
if (usec == 0)
|
|
|
|
usec = 500000;
|
|
|
|
usec = 500000;
|
|
|
|
done = 0;
|
|
|
|
done = 0;
|
|
|
|
@@ -1127,8 +1127,8 @@
|
|
|
|
@@ -1129,8 +1129,8 @@
|
|
|
|
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
|
|
|
|
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
|
|
|
|
INVALIDATE_CACHED_RANGE(map, from, size)
|
|
|
|
INVALIDATE_CACHED_RANGE(map, from, size)
|
|
|
|
|
|
|
|
|
|
|
@ -29,7 +29,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
|
|
|
|
|
|
|
|
@@ -1140,65 +1140,65 @@
|
|
|
|
@@ -1142,65 +1142,65 @@
|
|
|
|
static int inval_cache_and_wait_for_operation(
|
|
|
|
static int inval_cache_and_wait_for_operation(
|
|
|
|
struct map_info *map, struct flchip *chip,
|
|
|
|
struct map_info *map, struct flchip *chip,
|
|
|
|
unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
|
|
|
|
unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
|
|
|
@ -130,7 +130,7 @@ |
|
|
|
/* Done and happy. */
|
|
|
|
/* Done and happy. */
|
|
|
|
chip->state = FL_STATUS;
|
|
|
|
chip->state = FL_STATUS;
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
@@ -1207,7 +1207,8 @@
|
|
|
|
@@ -1209,7 +1209,8 @@
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
|
|
|
|
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
|
|
|
@ -140,7 +140,7 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
|
|
|
|
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
|
|
|
|
@@ -1438,7 +1439,7 @@
|
|
|
|
@@ -1443,7 +1444,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
|
|
|
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
|
|
|
adr, map_bankwidth(map),
|
|
|
|
adr, map_bankwidth(map),
|
|
|
@ -149,7 +149,7 @@ |
|
|
|
if (ret) {
|
|
|
|
if (ret) {
|
|
|
|
xip_enable(map, chip, adr);
|
|
|
|
xip_enable(map, chip, adr);
|
|
|
|
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
|
|
|
|
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
|
|
|
|
@@ -1678,7 +1679,7 @@
|
|
|
|
@@ -1683,7 +1684,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
|
|
|
|
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
|
|
|
|
initial_adr, initial_len,
|
|
|
|
initial_adr, initial_len,
|
|
|
@ -158,7 +158,7 @@ |
|
|
|
if (ret) {
|
|
|
|
if (ret) {
|
|
|
|
map_write(map, CMD(0x70), cmd_adr);
|
|
|
|
map_write(map, CMD(0x70), cmd_adr);
|
|
|
|
chip->state = FL_STATUS;
|
|
|
|
chip->state = FL_STATUS;
|
|
|
|
@@ -1813,7 +1814,7 @@
|
|
|
|
@@ -1818,7 +1819,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
|
|
|
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
|
|
|
|
adr, len,
|
|
|
|
adr, len,
|
|
|
|