From b629ed11a3afef6086cd5dbe1b0a642f12a16c4b Mon Sep 17 00:00:00 2001
From: Gordon Farquharson <gordonfarquharson@gmail.com>
Date: Wed, 27 Feb 2008 07:03:03 +0000
Subject: [PATCH] * [arm/iop32x] Enable support for the GLAN Tank flash chip
 (M29W400DB). * Fix changelog.

svn path=/dists/trunk/linux-2.6/; revision=10668
---
 debian/changelog                              |  6 ++--
 debian/config/arm/config.iop32x               |  4 +--
 .../patches/features/all/add-m29w400db.patch  | 36 +++++++++++++++++++
 debian/patches/series/1~experimental.1        |  1 +
 4 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 debian/patches/features/all/add-m29w400db.patch

diff --git a/debian/changelog b/debian/changelog
index 201f0140b..ad317746e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-iinux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release (closes: #456799)
 
@@ -42,6 +42,8 @@ iinux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
 
   [ Gordon Farquharson ]
   * [arm] Use GPIO LED driver as opposed to ixp4xx LED driver.
+  * [arm/iop32x] Enable support for the GLAN Tank flash chip
+    (M29W400DB).
 
   [ Aurelien Jarno ]
   * [mips/mipsel] Enable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for dynticks
@@ -54,7 +56,7 @@ iinux-2.6 (2.6.25~rc3-1~experimental.1) UNRELEASED; urgency=low
     - Broadcom NetXtremeII 10Gb support
   * [powerpc] Use new wrapper install support.
 
- -- Gordon Farquharson <gordonfarquharson@gmail.com>  Thu, 14 Feb 2008 00:25:23 -0700
+ -- Bastian Blank <waldi@debian.org>  Tue, 26 Feb 2008 23:59:55 -0700
 
 linux-2.6 (2.6.24-2) UNRELEASED; urgency=low
 
diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x
index 75ec5e206..764a6c989 100644
--- a/debian/config/arm/config.iop32x
+++ b/debian/config/arm/config.iop32x
@@ -342,7 +342,7 @@ CONFIG_MTD_BLOCK=y
 # RAM/ROM/Flash chip drivers
 #
 CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_NOSWAP=y
@@ -361,7 +361,7 @@ CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I8 is not set
 # CONFIG_MTD_OTP is not set
 CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
+CONFIG_MTD_CFI_AMDSTD=y
 # CONFIG_MTD_CFI_STAA is not set
 CONFIG_MTD_CFI_UTIL=y
 CONFIG_MTD_RAM=m
diff --git a/debian/patches/features/all/add-m29w400db.patch b/debian/patches/features/all/add-m29w400db.patch
new file mode 100644
index 000000000..2cc58a6bb
--- /dev/null
+++ b/debian/patches/features/all/add-m29w400db.patch
@@ -0,0 +1,36 @@
+diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
+index 4be51a8..51ec937 100644
+--- a/drivers/mtd/chips/jedec_probe.c
++++ b/drivers/mtd/chips/jedec_probe.c
+@@ -135,6 +135,7 @@
+ #define M29W160DT	0x22C4
+ #define M29W160DB	0x2249
+ #define M29W040B	0x00E3
++#define M29W400DB	0x00EF
+ #define M50FW040	0x002C
+ #define M50FW080	0x002D
+ #define M50FW016	0x002E
+@@ -1498,7 +1499,22 @@ static const struct amd_flash_info jedec_table[] = {
+ 		.regions	= {
+ 			ERASEINFO(0x10000,8),
+ 		}
+-        }, {
++	}, {
++		.mfr_id		= MANUFACTURER_ST,
++		.dev_id		= M29W400DB,
++		.name		= "ST M29W400DB",
++		.devtypes	= CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
++		.uaddr		= MTD_UADDR_0x0555_0x02AA,
++		.dev_size	= SIZE_512KiB,
++		.cmd_set	= P_ID_AMD_STD,
++		.nr_regions	= 4,
++		.regions	= {
++			ERASEINFO(0x04000,1),
++			ERASEINFO(0x02000,2),
++			ERASEINFO(0x08000,1),
++			ERASEINFO(0x10000,7)
++		}
++	}, {
+ 		.mfr_id		= MANUFACTURER_ST,
+ 		.dev_id		= M50FW040,
+ 		.name		= "ST M50FW040",
diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1
index 357dfe360..e85922bda 100644
--- a/debian/patches/series/1~experimental.1
+++ b/debian/patches/series/1~experimental.1
@@ -32,3 +32,4 @@
 + bugfix/arm/ignore-invalid-memtags.patch
 + bugfix/arm/fix-b43-driver-build-for-arm.patch
 + bugfix/fix-hifn_795X-divdi3.patch
++ features/all/add-m29w400db.patch