Merge branch 'master' of git://git.denx.de/u-boot-video

[karo-tx-uboot.git] / drivers / mtd / spi / spansion.c

diff --git a/drivers/mtd/spi/spansion.c b/drivers/mtd/spi/spansion.c
index 6301d871237d0b6c1d139cb086bb04b5a9282c15..dad30b54c54e97547f13c14039483da30e1eb409 100644 (file)
--- a/drivers/mtd/spi/spansion.c
+++ b/drivers/mtd/spi/spansion.c
@@ -31,34 +31,9 @@
 
 #include "spi_flash_internal.h"
 
-/* S25FLxx-specific commands */
-#define CMD_S25FLXX_READ       0x03    /* Read Data Bytes */
-#define CMD_S25FLXX_FAST_READ  0x0b    /* Read Data Bytes at Higher Speed */
-#define CMD_S25FLXX_READID     0x90    /* Read Manufacture ID and Device ID */
-#define CMD_S25FLXX_WREN       0x06    /* Write Enable */
-#define CMD_S25FLXX_WRDI       0x04    /* Write Disable */
-#define CMD_S25FLXX_RDSR       0x05    /* Read Status Register */
-#define CMD_S25FLXX_WRSR       0x01    /* Write Status Register */
-#define CMD_S25FLXX_PP         0x02    /* Page Program */
-#define CMD_S25FLXX_SE         0xd8    /* Sector Erase */
-#define CMD_S25FLXX_BE         0xc7    /* Bulk Erase */
-#define CMD_S25FLXX_DP         0xb9    /* Deep Power-down */
-#define CMD_S25FLXX_RES                0xab    /* Release from DP, and Read Signature */
-
-#define SPSN_ID_S25FL008A      0x0213
-#define SPSN_ID_S25FL016A      0x0214
-#define SPSN_ID_S25FL032A      0x0215
-#define SPSN_ID_S25FL064A      0x0216
-#define SPSN_ID_S25FL128P      0x2018
-#define SPSN_EXT_ID_S25FL128P_256KB    0x0300
-#define SPSN_EXT_ID_S25FL128P_64KB     0x0301
-#define SPSN_EXT_ID_S25FL032P          0x4d00
-#define SPSN_EXT_ID_S25FL129P          0x4d01
-
 struct spansion_spi_flash_params {
        u16 idcode1;
        u16 idcode2;
-       u16 page_size;
        u16 pages_per_sector;
        u16 nr_sectors;
        const char *name;
@@ -66,76 +41,70 @@ struct spansion_spi_flash_params {
 
 static const struct spansion_spi_flash_params spansion_spi_flash_table[] = {
        {
-               .idcode1 = SPSN_ID_S25FL008A,
+               .idcode1 = 0x0213,
                .idcode2 = 0,
-               .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 16,
                .name = "S25FL008A",
        },
        {
-               .idcode1 = SPSN_ID_S25FL016A,
+               .idcode1 = 0x0214,
                .idcode2 = 0,
-               .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 32,
                .name = "S25FL016A",
        },
        {
-               .idcode1 = SPSN_ID_S25FL032A,
+               .idcode1 = 0x0215,
                .idcode2 = 0,
-               .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 64,
                .name = "S25FL032A",
        },
        {
-               .idcode1 = SPSN_ID_S25FL064A,
+               .idcode1 = 0x0216,
                .idcode2 = 0,
-               .page_size = 256,
                .pages_per_sector = 256,
                .nr_sectors = 128,
                .name = "S25FL064A",
        },
        {
-               .idcode1 = SPSN_ID_S25FL128P,
-               .idcode2 = SPSN_EXT_ID_S25FL128P_64KB,
-               .page_size = 256,
+               .idcode1 = 0x2018,
+               .idcode2 = 0x0301,
                .pages_per_sector = 256,
                .nr_sectors = 256,
                .name = "S25FL128P_64K",
        },
        {
-               .idcode1 = SPSN_ID_S25FL128P,
-               .idcode2 = SPSN_EXT_ID_S25FL128P_256KB,
-               .page_size = 256,
+               .idcode1 = 0x2018,
+               .idcode2 = 0x0300,
                .pages_per_sector = 1024,
                .nr_sectors = 64,
                .name = "S25FL128P_256K",
        },
        {
-               .idcode1 = SPSN_ID_S25FL032A,
-               .idcode2 = SPSN_EXT_ID_S25FL032P,
-               .page_size = 256,
+               .idcode1 = 0x0215,
+               .idcode2 = 0x4d00,
                .pages_per_sector = 256,
                .nr_sectors = 64,
                .name = "S25FL032P",
        },
        {
-               .idcode1 = SPSN_ID_S25FL128P,
-               .idcode2 = SPSN_EXT_ID_S25FL129P,
-               .page_size = 256,
+               .idcode1 = 0x2018,
+               .idcode2 = 0x4d01,
                .pages_per_sector = 256,
                .nr_sectors = 256,
-               .name = "S25FL129P_64K",
+               .name = "S25FL129P_64K/S25FL128S",
+       },
+       {
+               .idcode1 = 0x0219,
+               .idcode2 = 0x4d01,
+               .pages_per_sector = 256,
+               .nr_sectors = 512,
+               .name = "S25FL256S",
        },
 };
 
-static int spansion_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-       return spi_flash_cmd_erase(flash, CMD_S25FLXX_SE, offset, len);
-}
-
 struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)
 {
        const struct spansion_spi_flash_params *params;
@@ -159,20 +128,14 @@ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)
                return NULL;
        }
 
-       flash = malloc(sizeof(*flash));
+       flash = spi_flash_alloc_base(spi, params->name);
        if (!flash) {
                debug("SF: Failed to allocate memory\n");
                return NULL;
        }
 
-       flash->spi = spi;
-       flash->name = params->name;
-
-       flash->write = spi_flash_cmd_write_multi;
-       flash->erase = spansion_erase;
-       flash->read = spi_flash_cmd_read_fast;
-       flash->page_size = params->page_size;
-       flash->sector_size = params->page_size * params->pages_per_sector;
+       flash->page_size = 256;
+       flash->sector_size = 256 * params->pages_per_sector;
        flash->size = flash->sector_size * params->nr_sectors;
 
        return flash;