amazon: Upgrade amazon target to kernel 2.6.37

[openwrt/staging/wigyori.git] / target / linux / amazon / patches-2.6.37 / 160-cfi-swap.patch

diff --git a/target/linux/amazon/patches-2.6.37/160-cfi-swap.patch b/target/linux/amazon/patches-2.6.37/160-cfi-swap.patch
new file mode 100644 (file)
index 0000000..65ce661
--- /dev/null
+++ b/target/linux/amazon/patches-2.6.37/160-cfi-swap.patch
@@ -0,0 +1,56 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1166,6 +1166,9 @@ static int __xipram do_write_oneword(str
+       int retry_cnt = 0;
+ 
+       adr += chip->start;
++#ifdef CONFIG_AMAZON
++      adr ^= 2;
++#endif
+ 
+       mutex_lock(&chip->mutex);
+       ret = get_chip(map, chip, adr, FL_WRITING);
+@@ -1433,7 +1436,11 @@ static int __xipram do_write_buffer(stru
+       z = 0;
+       while(z < words * map_bankwidth(map)) {
+               datum = map_word_load(map, buf);
++#ifdef CONFIG_AMAZON
++              map_write(map, datum, (adr + z) ^ 0x2);
++#else
+               map_write(map, datum, adr + z);
++#endif
+ 
+               z += map_bankwidth(map);
+               buf += map_bankwidth(map);
+@@ -1678,6 +1685,9 @@ static int __xipram do_erase_oneblock(st
+       int ret = 0;
+ 
+       adr += chip->start;
++#ifdef CONFIG_AMAZON
++      adr ^= 2;
++#endif
+ 
+       mutex_lock(&chip->mutex);
+       ret = get_chip(map, chip, adr, FL_ERASING);
+@@ -1806,6 +1816,10 @@ static int do_atmel_lock(struct map_info
+       struct cfi_private *cfi = map->fldrv_priv;
+       int ret;
+ 
++#ifdef CONFIG_AMAZON
++      adr ^= 2;
++#endif
++
+       mutex_lock(&chip->mutex);
+       ret = get_chip(map, chip, adr + chip->start, FL_LOCKING);
+       if (ret)
+@@ -1842,6 +1856,10 @@ static int do_atmel_unlock(struct map_in
+       struct cfi_private *cfi = map->fldrv_priv;
+       int ret;
+ 
++#ifdef CONFIG_AMAZON
++      adr ^= 2;
++#endif
++
+       mutex_lock(&chip->mutex);
+       ret = get_chip(map, chip, adr + chip->start, FL_UNLOCKING);
+       if (ret)