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

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

diff --git a/drivers/mtd/spi/macronix.c b/drivers/mtd/spi/macronix.c
index dacbc28b3e5e2d5bb86bdb84314aeb1388df0bd9..c97a39d49981201aa66178716b1cd457b55b7edc 100644 (file)
--- a/drivers/mtd/spi/macronix.c
+++ b/drivers/mtd/spi/macronix.c
@@ -35,25 +35,8 @@
 
 #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;
 };
@@ -61,106 +44,41 @@ struct macronix_spi_flash_params {
 static const struct macronix_spi_flash_params macronix_spi_flash_table[] = {
        {
                .idcode = 0x2013,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_blocks = 8,
                .name = "MX25L4005",
        },
        {
                .idcode = 0x2014,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .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_write_status(struct spi_flash *flash, u8 sr)
-{
-       u8 cmd;
-       int ret;
-
-       ret = spi_flash_cmd_write_enable(flash);
-       if (ret < 0) {
-               debug("SF: enabling write failed\n");
-               return ret;
-       }
-
-       cmd = CMD_MX25XX_WRSR;
-       ret = spi_flash_cmd_write(flash->spi, &cmd, 1, &sr, 1);
-       if (ret) {
-               debug("SF: fail to write status register\n");
-               return ret;
-       }
-
-       ret = spi_flash_cmd_wait_ready(flash, SPI_FLASH_PROG_TIMEOUT);
-       if (ret < 0) {
-               debug("SF: write status register timed out\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static int macronix_unlock(struct spi_flash *flash)
-{
-       int ret;
-
-       /* Enable status register writing and clear BP# bits */
-       ret = macronix_write_status(flash, 0);
-       if (ret)
-               debug("SF: fail to disable write protection\n");
-
-       return ret;
-}
-
-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;
@@ -189,15 +107,14 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
        flash->name = params->name;
 
        flash->write = spi_flash_cmd_write_multi;
-       flash->erase = macronix_erase;
+       flash->erase = spi_flash_cmd_erase;
        flash->read = spi_flash_cmd_read_fast;
-       flash->page_size = params->page_size;
-       flash->sector_size = params->page_size * params->pages_per_sector
-               * params->sectors_per_block;
+       flash->page_size = 256;
+       flash->sector_size = 256 * 16 * 16;
        flash->size = flash->sector_size * params->nr_blocks;
 
        /* Clear BP# bits for read-only flash */
-       macronix_unlock(flash);
+       spi_flash_cmd_write_status(flash, 0);
 
        return flash;
 }