diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:00 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-02-04 15:49:00 +0100 |
commit | 5c6cc8736ed4e14119fb2e8c0ed1ecab7caff9ae (patch) | |
tree | 2cfe169f6de668fbb69b7bfc5bcfd2b09551d91d /drivers/mtd/devices/m25p80.c | |
parent | da5fe0ba470283b384760c4976815fc20c1d45bd (diff) | |
parent | c384340f4e318687b63149d8b17a7864bc516069 (diff) | |
download | barebox-5c6cc8736ed4e14119fb2e8c0ed1ecab7caff9ae.tar.gz barebox-5c6cc8736ed4e14119fb2e8c0ed1ecab7caff9ae.tar.xz |
Merge branch 'for-next/mtd'
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
-rw-r--r-- | drivers/mtd/devices/m25p80.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 55b1020390..2db6fff617 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -743,6 +743,7 @@ static const struct spi_device_id m25p_ids[] = { { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) }, + { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) }, /* Catalyst / On Semiconductor -- non-JEDEC */ { "cat25c11", CAT25_INFO( 16, 8, 16, 1) }, |