| Message ID | 1369357789-27277-1-git-send-email-dantesu@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
On Fri, May 24, 2013 at 6:39 AM, Kuo-Jung Su <dantesu@gmail.com> wrote: > From: Kuo-Jung Su <dantesu@faraday-tech.com> > > Add support for Winbond's W25PXX SPI flash. > These devices is used on Faraday A369 evaluation board. > > Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com> > CC: Jagan Teki <jagannadh.teki@gmail.com> > CC: Tom Rini <trini@ti.com> > --- > Changes for v2: > - Update commit message header > - Add commit message body > > drivers/mtd/spi/winbond.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c > index 2716209..2a27837 100644 > --- a/drivers/mtd/spi/winbond.c > +++ b/drivers/mtd/spi/winbond.c > @@ -18,6 +18,21 @@ struct winbond_spi_flash_params { > > static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { > { > + .id = 0x2014, > + .nr_blocks = 16, > + .name = "W25P80", > + }, > + { > + .id = 0x2015, > + .nr_blocks = 32, > + .name = "W25P16", > + }, > + { > + .id = 0x2016, > + .nr_blocks = 64, > + .name = "W25P32", > + }, > + { > .id = 0x3013, > .nr_blocks = 8, > .name = "W25X40", > @@ -104,7 +119,7 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) > } > > flash->page_size = 256; > - flash->sector_size = 4096; > + flash->sector_size = (idcode[1] == 0x20) ? 65536 : 4096; > flash->size = 4096 * 16 * params->nr_blocks; > > return flash; > -- > 1.7.9.5 > Reviewed-by: Jagannadha Sutradharudu Teki <jagannadh.teki@gmail.com> -- Thanks, Jagan.
On 23-05-2013 20:39, Kuo-Jung Su wrote: > From: Kuo-Jung Su <dantesu@faraday-tech.com> > > Add support for Winbond's W25PXX SPI flash. > These devices is used on Faraday A369 evaluation board. > > Signed-off-by: Kuo-Jung Su <dantesu@faraday-tech.com> > CC: Jagan Teki <jagannadh.teki@gmail.com> > CC: Tom Rini <trini@ti.com> > > --- > Changes for v2: > - Update commit message header > - Add commit message body > > drivers/mtd/spi/winbond.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c > index 2716209..2a27837 100644 > --- a/drivers/mtd/spi/winbond.c > +++ b/drivers/mtd/spi/winbond.c > @@ -18,6 +18,21 @@ struct winbond_spi_flash_params { > > static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { > { > + .id = 0x2014, > + .nr_blocks = 16, > + .name = "W25P80", > + }, > + { > + .id = 0x2015, > + .nr_blocks = 32, > + .name = "W25P16", > + }, > + { > + .id = 0x2016, > + .nr_blocks = 64, > + .name = "W25P32", > + }, > + { > .id = 0x3013, > .nr_blocks = 8, > .name = "W25X40", > @@ -104,7 +119,7 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) > } > > flash->page_size = 256; > - flash->sector_size = 4096; > + flash->sector_size = (idcode[1] == 0x20) ? 65536 : 4096; > flash->size = 4096 * 16 * params->nr_blocks; > > return flash; Applied to u-boot-spi/master -- Thanks, Jagan.
diff --git a/drivers/mtd/spi/winbond.c b/drivers/mtd/spi/winbond.c index 2716209..2a27837 100644 --- a/drivers/mtd/spi/winbond.c +++ b/drivers/mtd/spi/winbond.c @@ -18,6 +18,21 @@ struct winbond_spi_flash_params { static const struct winbond_spi_flash_params winbond_spi_flash_table[] = { { + .id = 0x2014, + .nr_blocks = 16, + .name = "W25P80", + }, + { + .id = 0x2015, + .nr_blocks = 32, + .name = "W25P16", + }, + { + .id = 0x2016, + .nr_blocks = 64, + .name = "W25P32", + }, + { .id = 0x3013, .nr_blocks = 8, .name = "W25X40", @@ -104,7 +119,7 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode) } flash->page_size = 256; - flash->sector_size = 4096; + flash->sector_size = (idcode[1] == 0x20) ? 65536 : 4096; flash->size = 4096 * 16 * params->nr_blocks; return flash;