kernel: fix m25p80 patches for 2.6.33

SVN-Revision: 19961

diff --git a/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
index 860c36707b068faef222be0646c5542534a94c0e..54cc6bbe50af075b47544dae12189677a839c96c 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/084-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -5,8 +5,8 @@
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
  
 +      /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-+      { "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
-+      { "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
++      { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
++      { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
 +
        /* Spansion -- single (large) sector size only, at least
         * for the chips listed here (without boot sectors).

diff --git a/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch b/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
index 37104dc77600aa358bd0fd9444f41acccc691d3f..607430bb2d1409d9c9a77bc6934dfecbacef32f4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/085-mtd_m25p80_add_en25pxx_support.patch
@@ -5,9 +5,9 @@
        { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
  
 +      /* EON -- en25pxx */
-+      { "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
-+      { "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
++      { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
++      { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
 +
        /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-       { "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
-       { "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
+       { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
+       { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },

diff --git a/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
index 91d6b4f6115435e241620f7c2181d0daee7fe452..2f6d89927c1257e06978c4b20b34a8d66362e17d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch
@@ -1,28 +1,28 @@
 --- a/drivers/mtd/devices/m25p80.c
 +++ b/drivers/mtd/devices/m25p80.c
 @@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i
-       { "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
-       { "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
+       { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },
+       { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) },
  
 +      /* Numonyx -- xxxs33b */
-+      { "160s33b",  0x898911, 0, 64 * 1024,  64, },
-+      { "320s33b",  0x898912, 0, 64 * 1024, 128, },
-+      { "640s33b",  0x898913, 0, 64 * 1024, 256, },
++      { "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) },
++      { "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) },
++      { "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) },
 +
        /* PMC -- pm25x "blocks" are 32K, sectors are 4K */
-       { "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
-       { "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
+       { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) },
+       { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) },
 @@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s
        dev_set_drvdata(&spi->dev, flash);
  
        /*
 -       * Atmel and SST serial flash tend to power
-+       * Atmel, Intel/Numonyx and SST serial flash tend to power
++       * Atmel, SST and Intel/Numonyx serial flash tend to power
         * up with the software protection bits set
         */
  
        if (info->jedec_id >> 16 == 0x1f ||
-+          info->jedec_id >> 16 == 0x89) {
++          info->jedec_id >> 16 == 0x89 ||
            info->jedec_id >> 16 == 0xbf) {
                write_enable(flash);
                write_sr(flash, 0);