diff options
| author | Tom Rini <trini@ti.com> | 2013-03-20 14:55:10 -0400 | 
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-20 14:55:10 -0400 | 
| commit | 8b906a9f0b3fd0d4421e08c4fa62f61a01289611 (patch) | |
| tree | 049acc34fee9692c0c394b8d1697d97257c0a074 /drivers/mtd/spi/winbond.c | |
| parent | 3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff) | |
| parent | 1e7133e99e27c4f02998e7eb87fa43424d48152b (diff) | |
| download | olio-uboot-2014.01-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.xz olio-uboot-2014.01-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.zip | |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/mtd/spi/winbond.c')
| -rw-r--r-- | drivers/mtd/spi/winbond.c | 8 | 
1 files changed, 1 insertions, 7 deletions
| diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c index 441830216..05dc64492 100644 --- a/drivers/mtd/spi/winbond.c +++ b/drivers/mtd/spi/winbond.c @@ -92,18 +92,12 @@ struct spi_flash *spi_flash_probe_winbond(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 = 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; |