u-boot/drivers/mtd/spi/winbond.c
Stephen Warren c75942c7b7 sf: winbond: fix page_size
Commit a4ed3b6 "sf: inline data constants" modified winbond.c's page_size
from 256 to 4096. This prevents either/both of "sf write" writing the
correct data, or "sf read" from reading the correct data back.

This allows U-Boot running on Compulab Tegra to upgrade itself.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-08-14 11:34:30 -04:00

107 lines
1.9 KiB
C

/*
* Copyright 2008, Network Appliance Inc.
* Author: Jason McMullan <mcmullan <at> netapp.com>
* Licensed under the GPL-2 or later.
*/
#include <common.h>
#include <malloc.h>
#include <spi_flash.h>
#include "spi_flash_internal.h"
struct winbond_spi_flash_params {
uint16_t id;
uint16_t nr_blocks;
const char *name;
};
static const struct winbond_spi_flash_params winbond_spi_flash_table[] = {
{
.id = 0x3013,
.nr_blocks = 8,
.name = "W25X40",
},
{
.id = 0x3015,
.nr_blocks = 32,
.name = "W25X16",
},
{
.id = 0x3016,
.nr_blocks = 64,
.name = "W25X32",
},
{
.id = 0x3017,
.nr_blocks = 128,
.name = "W25X64",
},
{
.id = 0x4014,
.nr_blocks = 16,
.name = "W25Q80BL",
},
{
.id = 0x4015,
.nr_blocks = 32,
.name = "W25Q16",
},
{
.id = 0x4016,
.nr_blocks = 64,
.name = "W25Q32",
},
{
.id = 0x4017,
.nr_blocks = 128,
.name = "W25Q64",
},
{
.id = 0x4018,
.nr_blocks = 256,
.name = "W25Q128",
},
{
.id = 0x5014,
.nr_blocks = 128,
.name = "W25Q80",
},
};
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;
for (i = 0; i < ARRAY_SIZE(winbond_spi_flash_table); i++) {
params = &winbond_spi_flash_table[i];
if (params->id == ((idcode[1] << 8) | idcode[2]))
break;
}
if (i == ARRAY_SIZE(winbond_spi_flash_table)) {
debug("SF: Unsupported Winbond ID %02x%02x\n",
idcode[1], idcode[2]);
return NULL;
}
flash = malloc(sizeof(*flash));
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 = spi_flash_cmd_erase;
flash->read = spi_flash_cmd_read_fast;
flash->page_size = 256;
flash->sector_size = 4096;
flash->size = 4096 * 16 * params->nr_blocks;
return flash;
}