diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-03-10 01:06:48 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-03-10 01:06:48 +0000 |
| commit | f534cec6c9f2ac300fbbbc32ee59e67c3a1553a5 (patch) | |
| tree | b9477de9ca7d9a8acfd56caa84930b7ebd9c415e /target/linux | |
| parent | 203319948e27b7b355738651ea414e3d61193608 (diff) | |
| download | upstream-f534cec6c9f2ac300fbbbc32ee59e67c3a1553a5.tar.gz upstream-f534cec6c9f2ac300fbbbc32ee59e67c3a1553a5.tar.bz2 upstream-f534cec6c9f2ac300fbbbc32ee59e67c3a1553a5.zip | |
kernel/generic: drop already upstreamed patch
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39855 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-3.13/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch | 37 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.14/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch | 37 |
2 files changed, 0 insertions, 74 deletions
diff --git a/target/linux/generic/patches-3.13/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch b/target/linux/generic/patches-3.13/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch deleted file mode 100644 index 6cb1fb2e27..0000000000 --- a/target/linux/generic/patches-3.13/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7d75ef5f56dbc2bedb9a893eb9ecfd03c456338d Mon Sep 17 00:00:00 2001 -From: Flavio Silveira <fggs@terra.com.br> -Date: Thu, 29 Aug 2013 08:51:48 -0300 -Subject: [PATCH v2] mtd: m25p80: Add support for ESMT F25L32PA - -This flashchip is used in D-Link DIR-610 A1 router board -and maybe several others, yet is not kernel upstream. - -So add support for it according to datasheet [0], making it easier -to support other boards using this flashchip in the future. - -Changelog v2: - - Better description - - Datasheet link at the bottom, similar to other patches. - -[0] http://www.esmt.com.tw/DB/manager/upload/F25L32PA.pdf - -Signed-off-by: Flavio Silveira <fggs@terra.com.br> ---- - drivers/mtd/devices/m25p80.c | 3 +++ - 1 file changed, 3 insertions(+) - - http://patchwork.ozlabs.org/patch/272438/ - http://lists.infradead.org/pipermail/linux-mtd/2013-September/048511.html - ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -750,6 +750,9 @@ static const struct spi_device_id m25p_i - /* ESMT */ - { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) }, - -+ /* ESMT */ -+ { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) }, -+ - /* Everspin */ - { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, M25P_NO_ERASE | M25P_NO_FR) }, - { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3, M25P_NO_ERASE | M25P_NO_FR) }, diff --git a/target/linux/generic/patches-3.14/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch b/target/linux/generic/patches-3.14/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch deleted file mode 100644 index 7f9de4e8d3..0000000000 --- a/target/linux/generic/patches-3.14/009-mtd_m25p80_add_support_for_esmt_f25l32pa.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7d75ef5f56dbc2bedb9a893eb9ecfd03c456338d Mon Sep 17 00:00:00 2001 -From: Flavio Silveira <fggs@terra.com.br> -Date: Thu, 29 Aug 2013 08:51:48 -0300 -Subject: [PATCH v2] mtd: m25p80: Add support for ESMT F25L32PA - -This flashchip is used in D-Link DIR-610 A1 router board -and maybe several others, yet is not kernel upstream. - -So add support for it according to datasheet [0], making it easier -to support other boards using this flashchip in the future. - -Changelog v2: - - Better description - - Datasheet link at the bottom, similar to other patches. - -[0] http://www.esmt.com.tw/DB/manager/upload/F25L32PA.pdf - -Signed-off-by: Flavio Silveira <fggs@terra.com.br> ---- - drivers/mtd/devices/m25p80.c | 3 +++ - 1 file changed, 3 insertions(+) - - http://patchwork.ozlabs.org/patch/272438/ - http://lists.infradead.org/pipermail/linux-mtd/2013-September/048511.html - ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -908,6 +908,9 @@ static const struct spi_device_id m25p_i - /* ESMT */ - { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) }, - -+ /* ESMT */ -+ { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) }, -+ - /* Everspin */ - { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, M25P_NO_ERASE | M25P_NO_FR) }, - { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3, M25P_NO_ERASE | M25P_NO_FR) }, |