From 9ae4b60b8282ebeb8f4b43b4ed04210829f510b5 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Tue, 27 Apr 2010 04:19:33 +0200
Subject: [PATCH] --- yaml --- r: 195971 b: refs/heads/master c:
 087acaf1c6812d0ff4d4cb79c6f5a0e4e63815b3 h: refs/heads/master i:   195969:
 f3728aa1fae5060ccc1e782b7601b1d8bed3ab27   195967:
 ca19922b21223384555555f1a1c5c787ef44a593 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/mtd/chips/jedec_probe.c | 30 +++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 82a29dc0f72b..c3648787b32f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b60b08b02ca8d9575985ae6711bd656dd67e9039
+refs/heads/master: 087acaf1c6812d0ff4d4cb79c6f5a0e4e63815b3
diff --git a/trunk/drivers/mtd/chips/jedec_probe.c b/trunk/drivers/mtd/chips/jedec_probe.c
index b2e6f2f79de3..d72a5fb2d041 100644
--- a/trunk/drivers/mtd/chips/jedec_probe.c
+++ b/trunk/drivers/mtd/chips/jedec_probe.c
@@ -148,6 +148,8 @@
 #define SST39LF160	0x2782
 #define SST39VF1601	0x234b
 #define SST39VF3201	0x235b
+#define SST39WF1601	0x274b
+#define SST39WF1602	0x274a
 #define SST39LF512	0x00D4
 #define SST39LF010	0x00D5
 #define SST39LF020	0x00D6
@@ -1510,6 +1512,34 @@ static const struct amd_flash_info jedec_table[] = {
 			ERASEINFO(0x1000,256),
 			ERASEINFO(0x1000,256)
 		}
+	}, {
+		/* CFI is broken: reports AMD_STD, but needs custom uaddr */
+		.mfr_id		= CFI_MFR_SST,
+		.dev_id		= SST39WF1601,
+		.name		= "SST 39WF1601",
+		.devtypes	= CFI_DEVICETYPE_X16,
+		.uaddr		= MTD_UADDR_0xAAAA_0x5555,
+		.dev_size	= SIZE_2MiB,
+		.cmd_set	= P_ID_AMD_STD,
+		.nr_regions	= 2,
+		.regions	= {
+			ERASEINFO(0x1000,256),
+			ERASEINFO(0x1000,256)
+		}
+	}, {
+		/* CFI is broken: reports AMD_STD, but needs custom uaddr */
+		.mfr_id		= CFI_MFR_SST,
+		.dev_id		= SST39WF1602,
+		.name		= "SST 39WF1602",
+		.devtypes	= CFI_DEVICETYPE_X16,
+		.uaddr		= MTD_UADDR_0xAAAA_0x5555,
+		.dev_size	= SIZE_2MiB,
+		.cmd_set	= P_ID_AMD_STD,
+		.nr_regions	= 2,
+		.regions	= {
+			ERASEINFO(0x1000,256),
+			ERASEINFO(0x1000,256)
+		}
 	}, {
 		.mfr_id		= CFI_MFR_SST,     /* should be CFI */
 		.dev_id		= SST39VF3201,