X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fmtd%2Fspi%2Feon.c;h=25cfc1252c406e1a73c5e82a1885eefc038c2d1e;hb=af1679bc30b11b90f9f6650d211b3fe350f4044f;hp=806b44e6932e704c02f5b34b12de64c9ac0ec025;hpb=1902692aa0b2dcbb9351172be03c57d1e82447e4;p=u-boot

diff --git a/drivers/mtd/spi/eon.c b/drivers/mtd/spi/eon.c
index 806b44e693..25cfc1252c 100644
--- a/drivers/mtd/spi/eon.c
+++ b/drivers/mtd/spi/eon.c
@@ -10,44 +10,25 @@
 
 #include "spi_flash_internal.h"
 
-/* EN25Q128-specific commands */
-#define CMD_EN25Q128_WREN	0x06    /* Write Enable */
-#define CMD_EN25Q128_WRDI	0x04    /* Write Disable */
-#define CMD_EN25Q128_RDSR	0x05    /* Read Status Register */
-#define CMD_EN25Q128_WRSR	0x01    /* Write Status Register */
-#define CMD_EN25Q128_READ	0x03    /* Read Data Bytes */
-#define CMD_EN25Q128_FAST_READ	0x0b    /* Read Data Bytes at Higher Speed */
-#define CMD_EN25Q128_PP		0x02    /* Page Program */
-#define CMD_EN25Q128_SE		0x20    /* Sector Erase */
-#define CMD_EN25Q128_BE		0xd8    /* Block Erase */
-#define CMD_EN25Q128_DP		0xb9    /* Deep Power-down */
-#define CMD_EN25Q128_RES	0xab    /* Release from DP, and Read Signature */
-
 struct eon_spi_flash_params {
 	u8 idcode1;
-	u16 page_size;
-	u16 pages_per_sector;
-	u16 sectors_per_block;
 	u16 nr_sectors;
 	const char *name;
 };
 
 static const struct eon_spi_flash_params eon_spi_flash_table[] = {
+	{
+		.idcode1 = 0x16,
+		.nr_sectors = 1024,
+		.name = "EN25Q32B",
+	},
 	{
 		.idcode1 = 0x18,
-		.page_size = 256,
-		.pages_per_sector = 16,
-		.sectors_per_block = 16,
 		.nr_sectors = 4096,
 		.name = "EN25Q128",
 	},
 };
 
-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;
@@ -65,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;
 }