mtd: jedec_probe: fix NEC uPD29F064115 detection

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=9aff1b1afe9a30c358d1c3a0bb50ae77bd7f994b
Commit:     9aff1b1afe9a30c358d1c3a0bb50ae77bd7f994b
Parent:     a57ca0466af5da83e379d636b8c01fd53b41e2c6
Author:     Hiroshi Ito <ito at mlb.co.jp>
AuthorDate: Fri Sep 18 12:51:51 2009 -0700
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Sat Sep 19 11:25:56 2009 -0700

    mtd: jedec_probe: fix NEC uPD29F064115 detection
    
    linux v2.6.31-rc6 can not detect NEC uPD29F064115.
    
    uPD29F064115 is a 16 bit device.
    datasheet:
      http://www.cn.necel.com/memory/cn/download/M16062EJ2V0DS00.pdf
    
    This applies the same fix as used for SST chips in commit
    ca6f12c67ed19718cf37d0f531af9438de85b70c ("jedec_probe: Fix SST 16-bit
    chip detection").
    
    Signed-off-by: Hiroshi Ito <ito at mlb.co.jp>
    Cc: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/chips/jedec_probe.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index ccc4cfc..0f7065d 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -1156,8 +1156,8 @@ static const struct amd_flash_info jedec_table[] = {
 		.mfr_id		= MANUFACTURER_NEC,
 		.dev_id		= UPD29F064115,
 		.name		= "NEC uPD29F064115",
-		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
-		.uaddr		= MTD_UADDR_0x0555_0x02AA,	/* ???? */
+		.devtypes	= CFI_DEVICETYPE_X16,
+		.uaddr		= MTD_UADDR_0xAAAA_0x5555,
 		.dev_size	= SIZE_8MiB,
 		.cmd_set	= P_ID_AMD_STD,
 		.nr_regions	= 3,