diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-03-11 10:49:50 +0100 |
| commit | 251ae23e9fa0a5ab88823e63bb18b89706b7ea87 (patch) | |
| tree | 2c14c5b8fca7ab31335980ad359c56fc5fdb4cb2 /drivers/mtd/spi-nor | |
| parent | 034d4ddcb6dfc7f72cb5076807e93a7bb7e4636b (diff) | |
| parent | a1d621cbe3cc9ad7e8bdf35f51cbe61e5182ca1d (diff) | |
| download | barebox-251ae23e9fa0a5ab88823e63bb18b89706b7ea87.tar.gz barebox-251ae23e9fa0a5ab88823e63bb18b89706b7ea87.tar.xz | |
Merge branch 'for-next/mtd'
Diffstat (limited to 'drivers/mtd/spi-nor')
| -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 908aacb6a2..4b55b0c3d8 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -571,6 +571,7 @@ static const struct spi_device_id spi_nor_ids[] = { { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K) }, { "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) }, |