Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master'

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

diff --git a/drivers/mtd/spi/eon.c b/drivers/mtd/spi/eon.c
index 6a3bf0f3221365e80041a18ad1f84c2d93a5c410..25cfc1252c406e1a73c5e82a1885eefc038c2d1e 100644 (file)
--- a/drivers/mtd/spi/eon.c
+++ b/drivers/mtd/spi/eon.c
@@ -10,15 +10,8 @@
 
 #include "spi_flash_internal.h"
 
-/* EN25Q128-specific commands */
-#define CMD_EN25Q128_SE                0x20    /* Sector Erase */
-#define CMD_EN25Q128_BE                0xd8    /* Block Erase */
-
 struct eon_spi_flash_params {
        u8 idcode1;
-       u16 page_size;
-       u16 pages_per_sector;
-       u16 sectors_per_block;
        u16 nr_sectors;
        const char *name;
 };
@@ -26,35 +19,16 @@ struct eon_spi_flash_params {
 static const struct eon_spi_flash_params eon_spi_flash_table[] = {
        {
                .idcode1 = 0x16,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_sectors = 1024,
                .name = "EN25Q32B",
        },
        {
                .idcode1 = 0x18,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
                .nr_sectors = 4096,
                .name = "EN25Q128",
        },
-       {
-               .idcode1 = 0x16,
-               .page_size = 256,
-               .pages_per_sector = 16,
-               .sectors_per_block = 16,
-               .nr_sectors = 1024,
-               .name = "EN25Q32B",
-       },
 };
 
-static int eon_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-       return spi_flash_cmd_erase(flash, CMD_EN25Q128_BE, offset, len);
-}
-
 struct spi_flash *spi_flash_probe_eon(struct spi_slave *spi, u8 *idcode)
 {
        const struct eon_spi_flash_params *params;
@@ -72,23 +46,15 @@ struct spi_flash *spi_flash_probe_eon(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 = eon_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->size = params->page_size * params->pages_per_sector
-           * params->nr_sectors;
+       flash->page_size = 256;
+       flash->sector_size = 256 * 16 * 16;
+       flash->size = 256 * 16 * params->nr_sectors;
 
        return flash;
 }