--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -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
 
 /* Intel chips */
 #define I82802AB	0x00ad
@@ -1494,6 +1498,9 @@ static int __xipram do_write_oneword(str
 	int ret=0;
 
 	adr += chip->start;
+#ifdef CONFIG_IFXMIPS
+	adr ^= 2;
+#endif
 
 	switch (mode) {
 	case FL_WRITING:
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -39,7 +39,11 @@
 #include <linux/mtd/xip.h>
 
 #define AMD_BOOTLOC_BUG
-#define FORCE_WORD_WRITE 0
+#ifdef CONFIG_IFXMIPS
+#  define FORCE_WORD_WRITE 1
+#else
+#  define FORCE_WORD_WRITE 0
+#endif
 
 #define MAX_WORD_RETRIES 3
 
@@ -1096,7 +1100,9 @@ static int __xipram do_write_oneword(str
 	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) {