[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 009-revert_intel_flash_breakage.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
index 80fb4d4..0729007 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
-===================================================================
---- linux-2.6.23-rc6.orig/drivers/mtd/chips/cfi_cmdset_0001.c  2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c       2007-09-21 16:23:57.000000000 +0800
-@@ -933,7 +933,7 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0001.c
++++ b/drivers/mtd/chips/cfi_cmdset_0001.c
+@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m

  
  static int __xipram xip_wait_for_operation(
                struct map_info *map, struct flchip *chip,
  
  static int __xipram xip_wait_for_operation(
                struct map_info *map, struct flchip *chip,


@@ -11,7 +9,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  {
        struct cfi_private *cfi = map->fldrv_priv;
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
  {
        struct cfi_private *cfi = map->fldrv_priv;
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;

-@@ -942,7 +942,7 @@
+@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati

        flstate_t oldstate, newstate;
  
                start = xip_currtime();
        flstate_t oldstate, newstate;
  
                start = xip_currtime();


@@ -20,7 +18,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        if (usec == 0)
                usec = 500000;
        done = 0;
        if (usec == 0)
                usec = 500000;
        done = 0;

-@@ -1052,8 +1052,8 @@
+@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati

  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
        INVALIDATE_CACHED_RANGE(map, from, size)
  
  #define XIP_INVAL_CACHED_RANGE(map, from, size)  \
        INVALIDATE_CACHED_RANGE(map, from, size)
  


@@ -31,7 +29,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  
  #else
  
  
  #else
  

-@@ -1065,65 +1065,65 @@
+@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati

  static int inval_cache_and_wait_for_operation(
                struct map_info *map, struct flchip *chip,
                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
  static int inval_cache_and_wait_for_operation(
                struct map_info *map, struct flchip *chip,
                unsigned long cmd_adr, unsigned long inval_adr, int inval_len,


@@ -132,7 +130,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        /* Done and happy. */
        chip->state = FL_STATUS;
        return 0;
        /* Done and happy. */
        chip->state = FL_STATUS;
        return 0;

-@@ -1132,7 +1132,8 @@
+@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper

  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \
  #endif
  
  #define WAIT_TIMEOUT(map, chip, adr, udelay) \


@@ -142,7 +140,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
  
  
  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)

-@@ -1356,7 +1357,7 @@
+@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, map_bankwidth(map),
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, map_bankwidth(map),


@@ -151,7 +149,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        if (ret) {
                xip_enable(map, chip, adr);
                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
        if (ret) {
                xip_enable(map, chip, adr);
                printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);

-@@ -1593,7 +1594,7 @@
+@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
                                   initial_adr, initial_len,
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
                                   initial_adr, initial_len,


@@ -160,7 +158,7 @@ Index: linux-2.6.23-rc6/drivers/mtd/chips/cfi_cmdset_0001.c
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
                chip->state = FL_STATUS;
        if (ret) {
                map_write(map, CMD(0x70), cmd_adr);
                chip->state = FL_STATUS;

-@@ -1728,7 +1729,7 @@
+@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st

  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, len,
  
        ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
                                   adr, len,