diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-13 22:04:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-13 22:04:11 +0200 |
| commit | f16b608ae7d0c4611d3a41d2570616a498e64d4c (patch) | |
| tree | 213c9f261e590c22f21683a619d997a895ada35b /drivers/mtd/spi/stmicro.c | |
| parent | 107b56bdd8e82b07458df11f8df4a01067512281 (diff) | |
| parent | 1c091f59a03af9f2e821cb054fd555a2748dd091 (diff) | |
| download | olio-uboot-2014.01-f16b608ae7d0c4611d3a41d2570616a498e64d4c.tar.xz olio-uboot-2014.01-f16b608ae7d0c4611d3a41d2570616a498e64d4c.zip | |
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
Diffstat (limited to 'drivers/mtd/spi/stmicro.c')
| -rw-r--r-- | drivers/mtd/spi/stmicro.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 7ef690d9b..a1959ca98 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -197,12 +197,9 @@ static int stmicro_write(struct spi_flash *flash, return ret; } -int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len) +static int stmicro_erase(struct spi_flash *flash, u32 offset, size_t len) { - struct stmicro_spi_flash *stm = to_stmicro_spi_flash(flash); - return spi_flash_cmd_erase(flash, CMD_M25PXX_SE, - stm->params->page_size * stm->params->pages_per_sector, - offset, len); + return spi_flash_cmd_erase(flash, CMD_M25PXX_SE, offset, len); } struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) @@ -249,12 +246,8 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode) stm->flash.write = stmicro_write; stm->flash.erase = stmicro_erase; stm->flash.read = spi_flash_cmd_read_fast; - stm->flash.size = params->page_size * params->pages_per_sector - * params->nr_sectors; - - printf("SF: Detected %s with page size %u, total ", - params->name, params->page_size); - print_size(stm->flash.size, "\n"); + stm->flash.sector_size = params->page_size * params->pages_per_sector; + stm->flash.size = stm->flash.sector_size * params->nr_sectors; return &stm->flash; } |