Ignore:
Timestamp:
2010-03-03T10:40:20+01:00 (7 years ago)
Author:
juhosg
Message:

kernel: fix m25p80 patches for 2.6.33

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/generic-2.6/patches-2.6.33/086-mtd_m25p80_add_xxxs33b_support.patch

    r19905 r19961  
    22+++ b/drivers/mtd/devices/m25p80.c 
    33@@ -649,6 +649,11 @@ static const struct spi_device_id m25p_i 
    4         { "en25p32", 0x1c2016, 0, 64 * 1024,  64, }, 
    5         { "en25p64", 0x1c2017, 0, 64 * 1024, 128, }, 
     4        { "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) }, 
     5        { "en25p64", INFO(0x1c2017, 0, 64 * 1024, 128, 0) }, 
    66  
    77+       /* Numonyx -- xxxs33b */ 
    8 +       { "160s33b",  0x898911, 0, 64 * 1024,  64, }, 
    9 +       { "320s33b",  0x898912, 0, 64 * 1024, 128, }, 
    10 +       { "640s33b",  0x898913, 0, 64 * 1024, 256, }, 
     8+       { "160s33b",  INFO(0x898911, 0, 64 * 1024,  64, 0) }, 
     9+       { "320s33b",  INFO(0x898912, 0, 64 * 1024, 128, 0) }, 
     10+       { "640s33b",  INFO(0x898913, 0, 64 * 1024, 256, 0) }, 
    1111+ 
    1212        /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ 
    13         { "pm25lv512",         0, 32 * 1024, 2, SECT_4K }, 
    14         { "pm25lv010",         0, 32 * 1024, 4, SECT_4K }, 
     13        { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K) }, 
     14        { "pm25lv010", INFO(0, 0, 32 * 1024, 4, SECT_4K) }, 
    1515@@ -833,11 +838,12 @@ static int __devinit m25p_probe(struct s 
    1616        dev_set_drvdata(&spi->dev, flash); 
     
    1818        /* 
    1919-        * Atmel and SST serial flash tend to power 
    20 +        * Atmel, Intel/Numonyx and SST serial flash tend to power 
     20+        * Atmel, SST and Intel/Numonyx serial flash tend to power 
    2121         * up with the software protection bits set 
    2222         */ 
    2323  
    2424        if (info->jedec_id >> 16 == 0x1f || 
    25 +           info->jedec_id >> 16 == 0x89) { 
     25+           info->jedec_id >> 16 == 0x89 || 
    2626            info->jedec_id >> 16 == 0xbf) { 
    2727                write_enable(flash); 
Note: See TracChangeset for help on using the changeset viewer.