Rebased from upstream / out of band repository.
[librecmc/librecmc.git] / target / linux / generic / backport-4.9 / 061-v4.10-0003-mtd-spi-nor-fix-flags-for-s25fl128s.patch
1 From 4287916d7bab2806305d3296b4cf261fa49d959b Mon Sep 17 00:00:00 2001
2 From: Heiner Kallweit <hkallweit1@gmail.com>
3 Date: Thu, 27 Oct 2016 23:13:26 +0200
4 Subject: [PATCH] mtd: spi-nor: fix flags for s25fl128s
5
6 The Spansion S25FL128S also supports dual read mode.
7 In addition remove flag SECT_4K. 4K erases are supported,
8 but not uniformly.
9
10 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
11 Reviewed-by: Jagan Teki <jteki@openedev.com>
12 Acked-by: Marek Vasut <marek.vasut@gmail.com>
13 Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
14 ---
15  drivers/mtd/spi-nor/spi-nor.c | 2 +-
16  1 file changed, 1 insertion(+), 1 deletion(-)
17
18 --- a/drivers/mtd/spi-nor/spi-nor.c
19 +++ b/drivers/mtd/spi-nor/spi-nor.c
20 @@ -912,7 +912,7 @@ static const struct flash_info spi_nor_i
21         { "s70fl01gs",  INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
22         { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024,  64, 0) },
23         { "s25sl12801", INFO(0x012018, 0x0301,  64 * 1024, 256, 0) },
24 -       { "s25fl128s",  INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SECT_4K | SPI_NOR_QUAD_READ) },
25 +       { "s25fl128s",  INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
26         { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024,  64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
27         { "s25fl129p1", INFO(0x012018, 0x4d01,  64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
28         { "s25sl004a",  INFO(0x010212,      0,  64 * 1024,   8, 0) },