From 956b39887866b43219bd8e161717de11a7dce5d2 Mon Sep 17 00:00:00 2001 From: Gordon Farquharson Date: Sun, 23 Mar 2008 05:55:10 +0000 Subject: [PATCH] Rename and refresh patch to track version in -mm. svn path=/dists/trunk/linux-2.6/; revision=10945 --- ...ort-for-the-st-m29w400db-flash-chip.patch} | 34 +++++++++++++------ debian/patches/series/1~experimental.1 | 2 +- 2 files changed, 25 insertions(+), 11 deletions(-) rename debian/patches/features/all/{add-m29w400d.patch => mtd-nor-add-support-for-the-st-m29w400db-flash-chip.patch} (65%) diff --git a/debian/patches/features/all/add-m29w400d.patch b/debian/patches/features/all/mtd-nor-add-support-for-the-st-m29w400db-flash-chip.patch similarity index 65% rename from debian/patches/features/all/add-m29w400d.patch rename to debian/patches/features/all/mtd-nor-add-support-for-the-st-m29w400db-flash-chip.patch index dd09e5d54..22c9e0e37 100644 --- a/debian/patches/features/all/add-m29w400d.patch +++ b/debian/patches/features/all/mtd-nor-add-support-for-the-st-m29w400db-flash-chip.patch @@ -1,7 +1,20 @@ -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 +From: "Gordon Farquharson" + +Add support for the ST M29W400DB flash chip. which is used on the GLAN Tank +NAS. + +Signed-off-by: Gordon Farquharson +Cc: David Woodhouse +Cc: Thomas Gleixner +Signed-off-by: Andrew Morton +--- + + drivers/mtd/chips/jedec_probe.c | 42 ++++++++++++++++++++++++++---- + 1 file changed, 37 insertions(+), 5 deletions(-) + +diff -puN drivers/mtd/chips/jedec_probe.c~mtd-nor-add-support-for-the-st-m29w400db-flash-chip drivers/mtd/chips/jedec_probe.c +--- a/drivers/mtd/chips/jedec_probe.c~mtd-nor-add-support-for-the-st-m29w400db-flash-chip ++++ a/drivers/mtd/chips/jedec_probe.c @@ -132,6 +132,8 @@ #define M29F800AB 0x0058 #define M29W800DT 0x00D7 @@ -11,7 +24,7 @@ index 4be51a8..00159f5 100644 #define M29W160DT 0x22C4 #define M29W160DB 0x2249 #define M29W040B 0x00E3 -@@ -1426,7 +1428,7 @@ static const struct amd_flash_info jedec_table[] = { +@@ -1426,7 +1428,7 @@ static const struct amd_flash_info jedec ERASEINFO(0x08000,1), ERASEINFO(0x10000,15), } @@ -20,7 +33,7 @@ index 4be51a8..00159f5 100644 .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[] = { +@@ -1456,6 +1458,36 @@ static const struct amd_flash_info jedec ERASEINFO(0x08000,1), ERASEINFO(0x10000,15) } @@ -57,7 +70,7 @@ index 4be51a8..00159f5 100644 }, { .mfr_id = MANUFACTURER_ST, /* FIXME - CFI device? */ .dev_id = M29W160DT, -@@ -1486,7 +1518,7 @@ static const struct amd_flash_info jedec_table[] = { +@@ -1486,7 +1518,7 @@ static const struct amd_flash_info jedec ERASEINFO(0x08000,1), ERASEINFO(0x10000,31) } @@ -66,7 +79,7 @@ index 4be51a8..00159f5 100644 .mfr_id = MANUFACTURER_ST, .dev_id = M29W040B, .name = "ST M29W040B", -@@ -1498,7 +1530,7 @@ static const struct amd_flash_info jedec_table[] = { +@@ -1498,7 +1530,7 @@ static const struct amd_flash_info jedec .regions = { ERASEINFO(0x10000,8), } @@ -75,7 +88,7 @@ index 4be51a8..00159f5 100644 .mfr_id = MANUFACTURER_ST, .dev_id = M50FW040, .name = "ST M50FW040", -@@ -1510,7 +1542,7 @@ static const struct amd_flash_info jedec_table[] = { +@@ -1510,7 +1542,7 @@ static const struct amd_flash_info jedec .regions = { ERASEINFO(0x10000,8), } @@ -84,7 +97,7 @@ index 4be51a8..00159f5 100644 .mfr_id = MANUFACTURER_ST, .dev_id = M50FW080, .name = "ST M50FW080", -@@ -1522,7 +1554,7 @@ static const struct amd_flash_info jedec_table[] = { +@@ -1522,7 +1554,7 @@ static const struct amd_flash_info jedec .regions = { ERASEINFO(0x10000,16), } @@ -93,3 +106,4 @@ index 4be51a8..00159f5 100644 .mfr_id = MANUFACTURER_ST, .dev_id = M50FW016, .name = "ST M50FW016", +_ diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index 594ed2a4f..707bb0749 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -31,7 +31,7 @@ + bugfix/arm/disable-r6040.patch + features/all/at76.patch + bugfix/fix-hifn_795X-divdi3.patch -+ features/all/add-m29w400d.patch ++ features/all/mtd-nor-add-support-for-the-st-m29w400db-flash-chip.patch + bugfix/all/rtc-x1205-new-style-conversion.patch + bugfix/all/rtc-x1205-new-style-conversion-checkpatch-fixes.patch + bugfix/all/file2alias-cross-compile-fix.patch