On Wed, Jun 14, 2017 at 08:57:05PM +0200, Uwe Kleine-König wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
> ---
> drivers/mtd/spi-nor/spi-nor.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 3f1def66c6c1..fb13cd12694a 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -557,28 +557,30 @@ static const struct spi_device_id spi_nor_ids[] = {
> * for the chips listed here (without boot sectors).
> */
> { "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> - { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, 0) },
> + { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
> { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
> { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) },
> { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) },
> - { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_QUAD_READ) },
> - { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, 0) },
> - { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, 0) },
> + { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> + { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> + { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> { "s25sl004a", INFO(0x010212, 0, 64 * 1024, 8, 0) },
> { "s25sl008a", INFO(0x010213, 0, 64 * 1024, 16, 0) },
> { "s25sl016a", INFO(0x010214, 0, 64 * 1024, 32, 0) },
> { "s25sl032a", INFO(0x010215, 0, 64 * 1024, 64, 0) },
> { "s25sl064a", INFO(0x010216, 0, 64 * 1024, 128, 0) },
> - { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
> - { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K) },
> + { "s25fl004k", INFO(0xef4013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> + { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> + { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> { "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
> - { "s25fl116k", INFO(0x014015, 0, 64 * 1024, 32, SECT_4K) },
> - { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, 0) },
> - { "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K) },
> - { "s25fl208k", INFO(0x014014, 0, 64 * 1024, 16, SECT_4K) },
> + { "s25fl116k", INFO(0x014015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
> + { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, SECT_4K) },
> + { "s25fl164k", INFO(0x014017, 0, 64 * 1024, 128, SECT_4K) },
> + { "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ) },
> + { "s25fl208k", INFO(0x014014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ) },
>
> /* SST -- large erase sizes are "overlays", "sectors" are 4K */
> { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) },
> --
> 2.11.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
