summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHiroshi Ito <ito@mlb.co.jp>2009-09-18 21:51:51 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-09-19 20:25:56 +0200
commit9aff1b1afe9a30c358d1c3a0bb50ae77bd7f994b (patch)
treeeaa1a66b5f2776b91d23427922821f933d562695 /drivers
parentmtd: mtdpart: prevent a read from regions[-1] (diff)
downloadlinux-9aff1b1afe9a30c358d1c3a0bb50ae77bd7f994b.tar.xz
linux-9aff1b1afe9a30c358d1c3a0bb50ae77bd7f994b.zip
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@mlb.co.jp> Cc: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/chips/jedec_probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index ccc4cfc7e4b5..0f7065d190f5 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,