From bfb56a5b61c4eca74f749e44f916b3f89fb225c1 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Sun, 30 Mar 2008 21:19:29 -0700 Subject: [PATCH] --- yaml --- r: 93043 b: refs/heads/master c: fecb8865def541ff38f59ef3caf0cbd09f4fc9fd h: refs/heads/master i: 93041: b589680b908777c0501bf5b105a1c872807bb206 93039: 50df01fc5da885cc6325275a6163d9df6950bc94 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/chips/cfi_probe.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 74503318019f..d7e8aac9f467 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ff6631be150702ed4c92b46b77941affee866ba +refs/heads/master: fecb8865def541ff38f59ef3caf0cbd09f4fc9fd diff --git a/trunk/drivers/mtd/chips/cfi_probe.c b/trunk/drivers/mtd/chips/cfi_probe.c index b03d43ef9108..a4463a91ce31 100644 --- a/trunk/drivers/mtd/chips/cfi_probe.c +++ b/trunk/drivers/mtd/chips/cfi_probe.c @@ -232,6 +232,11 @@ static int __xipram cfi_chip_setup(struct map_info *map, cfi->mfr = cfi_read_query16(map, base); cfi->id = cfi_read_query16(map, base + ofs_factor); + /* Get AMD/Spansion extended JEDEC ID */ + if (cfi->mfr == CFI_MFR_AMD && (cfi->id & 0xff) == 0x7e) + cfi->id = cfi_read_query(map, base + 0xe * ofs_factor) << 8 | + cfi_read_query(map, base + 0xf * ofs_factor); + /* Put it back into Read Mode */ cfi_send_gen_cmd(0xF0, 0, base, map, cfi, cfi->device_type, NULL); /* ... even if it's an Intel chip */