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

[u-boot] / drivers / mtd / spi / macronix.c

diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index 0a56420300d48033d1380160e060c3e4062fd8e1..036c30d3beee54488de1b20b4cedd8b93b2a7d75 100644 (file)
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -35,92 +35,54 @@
 
 #include "spi_flash_internal.h"
 
-/* MX25xx-specific commands */
-#define CMD_MX25XX_WREN                0x06    /* Write Enable */
-#define CMD_MX25XX_WRDI                0x04    /* Write Disable */
-#define CMD_MX25XX_RDSR                0x05    /* Read Status Register */
-#define CMD_MX25XX_WRSR                0x01    /* Write Status Register */
-#define CMD_MX25XX_READ                0x03    /* Read Data Bytes */
-#define CMD_MX25XX_FAST_READ   0x0b    /* Read Data Bytes at Higher Speed */
-#define CMD_MX25XX_PP          0x02    /* Page Program */
-#define CMD_MX25XX_SE          0x20    /* Sector Erase */
-#define CMD_MX25XX_BE          0xD8    /* Block Erase */
-#define CMD_MX25XX_CE          0xc7    /* Chip Erase */
-#define CMD_MX25XX_DP          0xb9    /* Deep Power-down */
-#define CMD_MX25XX_RES         0xab    /* Release from DP, and Read Signature */
-
 struct macronix_spi_flash_params {
        u16 idcode;
-       u16 page_size;
-       u16 pages_per_sector;
-       u16 sectors_per_block;
        u16 nr_blocks;
        const char *name;
 };
 
-struct macronix_spi_flash {
-       struct spi_flash flash;
-       const struct macronix_spi_flash_params *params;
-};
-
-static inline struct macronix_spi_flash *to_macronix_spi_flash(struct spi_flash
-                                                              *flash)
-{
-       return container_of(flash, struct macronix_spi_flash, flash);
-}
-
 static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
+       {
+               .idcode = 0x2013,
+               .nr_blocks = 8,
+               .name = "MX25L4005",
+       },
+       {
+               .idcode = 0x2014,
+               .nr_blocks = 16,
+               .name = "MX25L8005",
+       },
        {
                .idcode = 0x2015,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_blocks = 32,
                .name = "MX25L1605D",
        },
        {
                .idcode = 0x2016,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_blocks = 64,
                .name = "MX25L3205D",
        },
        {
                .idcode = 0x2017,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_blocks = 128,
                .name = "MX25L6405D",
        },
        {
                .idcode = 0x2018,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_blocks = 256,
                .name = "MX25L12805D",
        },
        {
                .idcode = 0x2618,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_blocks = 256,
                .name = "MX25L12855E",
        },
 };
 
-static int macronix_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-       return spi_flash_cmd_erase(flash, CMD_MX25XX_BE, offset, len);
-}
-
 struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
 {
        const struct macronix_spi_flash_params *params;
-       struct macronix_spi_flash *mcx;
+       struct spi_flash *flash;
        unsigned int i;
        u16 id = idcode[2] | idcode[1] << 8;
 
@@ -135,23 +97,18 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
                return NULL;
        }
 
-       mcx = malloc(sizeof(*mcx));
-       if (!mcx) {
+       flash = spi_flash_alloc_base(spi, params->name);
+       if (!flash) {
                debug("SF: Failed to allocate memory\n");
                return NULL;
        }
 
-       mcx->params = params;
-       mcx->flash.spi = spi;
-       mcx->flash.name = params->name;
+       flash->page_size = 256;
+       flash->sector_size = 256 * 16 * 16;
+       flash->size = flash->sector_size * params->nr_blocks;
 
-       mcx->flash.write = spi_flash_cmd_write_multi;
-       mcx->flash.erase = macronix_erase;
-       mcx->flash.read = spi_flash_cmd_read_fast;
-       mcx->flash.page_size = params->page_size;
-       mcx->flash.sector_size = params->page_size * params->pages_per_sector
-               * params->sectors_per_block;
-       mcx->flash.size = mcx->flash.sector_size * params->nr_blocks;
+       /* Clear BP# bits for read-only flash */
+       spi_flash_cmd_write_status(flash, 0);
 
-       return &mcx->flash;
+       return flash;
 }