From 67f287b34e83dc695b3fb9f7923d34524f04eb22 Mon Sep 17 00:00:00 2001 From: Vivien Didelot Date: Tue, 14 Aug 2012 15:24:07 -0400 Subject: [PATCH] --- yaml --- r: 332707 b: refs/heads/master c: 8da28681eb1430fb6715c7aef67001acfbbbcba5 h: refs/heads/master i: 332705: 821ca9483e13bd067bd0fc6fb5c68d297b884b67 332703: aa05bff9964ba2a985e5d5278f6ad6fe9cbbe5ad v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b8214eafbd9..ac322aac9f7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db68f288968cd563b383dfaa1c3c5b58c3d9ad20 +refs/heads/master: 8da28681eb1430fb6715c7aef67001acfbbbcba5 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index d16f75ce16e9..980cd6dac5d7 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -662,6 +662,9 @@ static const struct spi_device_id m25p_ids[] = { { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) }, { "mx25l25655e", INFO(0xc22619, 0, 64 * 1024, 512, 0) }, + /* Micron */ + { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) }, + /* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors). */