diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-16 18:40:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-04-16 18:40:49 +0200 |
| commit | a1f5e9f895c704f068cf038bc05cbac6f7c9f310 (patch) | |
| tree | 1d97a0993e8035d2137b1e5520b26a6c099b352d /drivers/mtd | |
| parent | 32a48332753ac141998197f9f0e9c99d0d855102 (diff) | |
| parent | 27d4a8f9a277ca362c7d6cecb53b65159c4bea10 (diff) | |
| download | barebox-a1f5e9f895c704f068cf038bc05cbac6f7c9f310.tar.gz barebox-a1f5e9f895c704f068cf038bc05cbac6f7c9f310.tar.xz | |
Merge branch 'for-next/spi'
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/spi-nor/spi-nor.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index 038d7072aa..5cc4573178 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -640,6 +640,9 @@ static const struct spi_device_id spi_nor_ids[] = { { "at45db081d", INFO(0x1f2500, 0, 64 * 1024, 16, SECT_4K) }, + /* Cypress */ + { "cy15x104q", INFO6(0x042cc2, 0x7f7f7f, 512 * 1024, 1, SPI_NOR_NO_ERASE) }, + /* EON -- en25xxx */ { "en25f32", INFO(0x1c3116, 0, 64 * 1024, 64, SECT_4K) }, { "en25p32", INFO(0x1c2016, 0, 64 * 1024, 64, 0) }, |