Author: gordon-guest
Date: Fri Feb 29 07:05:18 2008
New Revision: 10677
Log:
Update MTD NOR M29W400DB patch. This patch has been added to Andrew
Morton's -mm tree.
Added:
dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400d.patch
Removed:
dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400db.patch
Modified:
dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Added: dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400d.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/all/add-m29w400d.patch
Fri Feb 29 07:05:18 2008
@@ -0,0 +1,95 @@
+diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
+index 4be51a8..00159f5 100644
+--- a/drivers/mtd/chips/jedec_probe.c
++++ b/drivers/mtd/chips/jedec_probe.c
+@@ -132,6 +132,8 @@
+ #define M29F800AB 0x0058
+ #define M29W800DT 0x00D7
+ #define M29W800DB 0x005B
++#define M29W400DT 0x00EE
++#define M29W400DB 0x00EF
+ #define M29W160DT 0x22C4
+ #define M29W160DB 0x2249
+ #define M29W040B 0x00E3
+@@ -1426,7 +1428,7 @@ static const struct amd_flash_info jedec_table[] = {
+ ERASEINFO(0x08000,1),
+ ERASEINFO(0x10000,15),
+ }
+- }, {
++ }, {
+ .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device?
*/
+ .dev_id = M29W800DT,
+ .name = "ST M29W800DT",
+@@ -1456,6 +1458,36 @@ static const struct amd_flash_info jedec_table[] = {
+ ERASEINFO(0x08000,1),
+ ERASEINFO(0x10000,15)
+ }
++ }, {
++ .mfr_id = MANUFACTURER_ST,
++ .dev_id = M29W400DT,
++ .name = "ST M29W400DT",
++ .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
++ .uaddr = MTD_UADDR_0x0AAA_0x0555,
++ .dev_size = SIZE_512KiB,
++ .cmd_set = P_ID_AMD_STD,
++ .nr_regions = 4,
++ .regions = {
++ ERASEINFO(0x04000,7),
++ ERASEINFO(0x02000,1),
++ ERASEINFO(0x08000,2),
++ ERASEINFO(0x10000,1)
++ }
++ }, {
++ .mfr_id = MANUFACTURER_ST,
++ .dev_id = M29W400DB,
++ .name = "ST M29W400DB",
++ .devtypes = CFI_DEVICETYPE_X16|CFI_DEVICETYPE_X8,
++ .uaddr = MTD_UADDR_0x0AAA_0x0555,
++ .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, /* FIXME - CFI device?
*/
+ .dev_id = M29W160DT,
+@@ -1486,7 +1518,7 @@ static const struct amd_flash_info jedec_table[] = {
+ ERASEINFO(0x08000,1),
+ ERASEINFO(0x10000,31)
+ }
+- }, {
++ }, {
+ .mfr_id = MANUFACTURER_ST,
+ .dev_id = M29W040B,
+ .name = "ST M29W040B",
+@@ -1498,7 +1530,7 @@ static const struct amd_flash_info jedec_table[] = {
+ .regions = {
+ ERASEINFO(0x10000,8),
+ }
+- }, {
++ }, {
+ .mfr_id = MANUFACTURER_ST,
+ .dev_id = M50FW040,
+ .name = "ST M50FW040",
+@@ -1510,7 +1542,7 @@ static const struct amd_flash_info jedec_table[] = {
+ .regions = {
+ ERASEINFO(0x10000,8),
+ }
+- }, {
++ }, {
+ .mfr_id = MANUFACTURER_ST,
+ .dev_id = M50FW080,
+ .name = "ST M50FW080",
+@@ -1522,7 +1554,7 @@ static const struct amd_flash_info jedec_table[] = {
+ .regions = {
+ ERASEINFO(0x10000,16),
+ }
+- }, {
++ }, {
+ .mfr_id = MANUFACTURER_ST,
+ .dev_id = M50FW016,
+ .name = "ST M50FW016",
Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1 Fri Feb
29 07:05:18 2008
@@ -32,4 +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
++ features/all/add-m29w400d.patch
_______________________________________________
Kernel-svn-changes mailing list
Kernel-svn-changes@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
