diff options
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 45cb05ad8f3d..10450cd0621f 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -503,15 +503,6 @@ static struct flash_info __devinitdata m25p_data [] = { { "at26df161a", 0x1f4601, 0, 64 * 1024, 32, SECT_4K, }, { "at26df321", 0x1f4701, 0, 64 * 1024, 64, SECT_4K, }, - /* Macronix */ - { "mx25l4005a", 0xc22013, 0, 64 * 1024, 8, SECT_4K }, - { "mx25l3205d", 0xc22016, 0, 64 * 1024, 64, 0 }, - { "mx25l6405d", 0xc22017, 0, 64 * 1024, 128, 0 }, - { "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, 0 }, - - { "mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0 }, - { "mx25l25635e", 0xc22019, 0, 64 * 1024, 512, 0 }, - /* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors). */ @@ -637,7 +628,12 @@ static int __devinit m25p_probe(struct spi_device *spi) dev_warn(&spi->dev, "found %s, expected %s\n", chip ? chip->name : "UNKNOWN", info->name); - info = NULL; + if (chip) { + dev_warn(&spi->dev, "Use %s instead\n", chip->name); + info = chip; + } else { + dev_warn(&spi->dev, "Force to use %s\n", info->name); + } } } } else |