1 files changed, 4 insertions, 51 deletions

diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c
index 0e126f40c5..427b71fcdc 100644
--- a/drivers/mtd/spi/winbond.c
+++ b/drivers/mtd/spi/winbond.c
@@ -10,17 +10,8 @@
 
 #include "spi_flash_internal.h"
 
-/* M25Pxx-specific commands */
-#define CMD_W25_SE		0x20	/* Sector (4K) Erase */
-#define CMD_W25_BE		0xd8	/* Block (64K) Erase */
-#define CMD_W25_CE		0xc7	/* Chip Erase */
-
 struct winbond_spi_flash_params {
 	uint16_t	id;
-	/* Log2 of page size in power-of-two mode */
-	uint8_t		l2_page_size;
-	uint16_t	pages_per_sector;
-	uint16_t	sectors_per_block;
 	uint16_t	nr_blocks;
 	const char	*name;
 };
@@ -28,89 +19,56 @@ struct winbond_spi_flash_params {
 static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
 	{
 		.id			= 0x3013,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 8,
 		.name			= "W25X40",
 	},
 	{
 		.id			= 0x3015,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 32,
 		.name			= "W25X16",
 	},
 	{
 		.id			= 0x3016,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 64,
 		.name			= "W25X32",
 	},
 	{
 		.id			= 0x3017,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 128,
 		.name			= "W25X64",
 	},
 	{
 		.id			= 0x4014,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 16,
 		.name			= "W25Q80BL",
 	},
 	{
 		.id			= 0x4015,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 32,
 		.name			= "W25Q16",
 	},
 	{
 		.id			= 0x4016,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 64,
 		.name			= "W25Q32",
 	},
 	{
 		.id			= 0x4017,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 128,
 		.name			= "W25Q64",
 	},
 	{
 		.id			= 0x4018,
-		.l2_page_size		= 8,
-		.pages_per_sector	= 16,
-		.sectors_per_block	= 16,
 		.nr_blocks		= 256,
 		.name			= "W25Q128",
 	},
 };
 
-static int winbond_erase(struct spi_flash *flash, u32 offset, size_t len)
-{
-	return spi_flash_cmd_erase(flash, CMD_W25_SE, offset, len);
-}
-
 struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
 {
 	const struct winbond_spi_flash_params *params;
 	struct spi_flash *flash;
 	unsigned int i;
-	unsigned page_size;
 
 	for (i = 0; i < ARRAY_SIZE(winbond_spi_flash_table); i++) {
 		params = &winbond_spi_flash_table[i];
@@ -133,17 +91,12 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
 	flash->spi = spi;
 	flash->name = params->name;
 
-	/* Assuming power-of-two page size initially. */
-	page_size = 1 << params->l2_page_size;
-
 	flash->write = spi_flash_cmd_write_multi;
-	flash->erase = winbond_erase;
+	flash->erase = spi_flash_cmd_erase;
 	flash->read = spi_flash_cmd_read_fast;
-	flash->page_size = page_size;
-	flash->sector_size = page_size * params->pages_per_sector;
-	flash->size = page_size * params->pages_per_sector
-				* params->sectors_per_block
-				* params->nr_blocks;
+	flash->page_size = 4096;
+	flash->sector_size = 4096;
+	flash->size = 4096 * 16 * params->nr_blocks;
 
 	return flash;
 }