diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
| commit | 2cd2bad2b79a9dbd03ba655a4a04fcaa602eac2b (patch) | |
| tree | a6776dae840eff846645374286e9a4ed08c59536 /drivers/mtd/spi-nor/spi-nor.c | |
| parent | 30139163b75970fcd58df6b6b987883e36571046 (diff) | |
| parent | 45e9299b8f51a13e3952129e10912964d7b90144 (diff) | |
| download | barebox-2cd2bad2b79a9dbd03ba655a4a04fcaa602eac2b.tar.gz barebox-2cd2bad2b79a9dbd03ba655a4a04fcaa602eac2b.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/mtd/spi-nor/spi-nor.c')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index faeafe1bfb..3f1def66c6 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -578,6 +578,7 @@ static const struct spi_device_id spi_nor_ids[] = { { "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) }, /* SST -- large erase sizes are "overlays", "sectors" are 4K */ { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) }, |