diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-02-08 09:37:05 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-02-08 09:37:05 +0000 |
| commit | ca5d6a7546221e2737702dcbff102ff2a1a1a38c (patch) | |
| tree | ad6aaa55c2d77126efc61bbfcd1bafce81d34b42 | |
| parent | 59375ef46b246cb18a18ea72ff9ebd79e329de0c (diff) | |
| download | upstream-ca5d6a7546221e2737702dcbff102ff2a1a1a38c.tar.gz upstream-ca5d6a7546221e2737702dcbff102ff2a1a1a38c.tar.bz2 upstream-ca5d6a7546221e2737702dcbff102ff2a1a1a38c.zip | |
ar71xx: drop the mx25lxxx patch, these chips are supported in 2.6.32.7 already
SVN-Revision: 19545
4 files changed, 6 insertions, 20 deletions
diff --git a/target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch deleted file mode 100644 index 201c20546a..0000000000 --- a/target/linux/ar71xx/patches-2.6.32/105-mtd_m25p80_add_mx25lxxx_support.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m - { "en25p32", 0x1c2016, 0, 64 * 1024, 64, }, - { "en25p64", 0x1c2017, 0, 64 * 1024, 128, }, - -+ /* Macronix -- mx25lxxx */ -+ { "mx25l32", 0xc22016, 0, 64 * 1024, 64, }, -+ { "mx25l64", 0xc22017, 0, 64 * 1024, 128, }, -+ { "mx25l128", 0xc22018, 0, 64 * 1024, 256, }, -+ - /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ - { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, - { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, diff --git a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch index 8f1a842beb..0c7c227ed8 100644 --- a/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch +++ b/target/linux/ar71xx/patches-2.6.32/106-mtd_m25p80_add_xxxs33b_support.patch @@ -1,8 +1,8 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -635,6 +635,11 @@ static struct flash_info __devinitdata m - { "mx25l64", 0xc22017, 0, 64 * 1024, 128, }, - { "mx25l128", 0xc22018, 0, 64 * 1024, 256, }, +@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m + { "en25p32", 0x1c2016, 0, 64 * 1024, 64, }, + { "en25p64", 0x1c2017, 0, 64 * 1024, 128, }, + /* Numonyx -- xxxs33b */ + { "160s33b", 0x898911, 0, 64 * 1024, 64, }, @@ -12,7 +12,7 @@ /* PMC -- pm25x "blocks" are 32K, sectors are 4K */ { "pm25lv512", 0, 32 * 1024, 2, SECT_4K }, { "pm25lv010", 0, 32 * 1024, 4, SECT_4K }, -@@ -789,11 +794,12 @@ static int __devinit m25p_probe(struct s +@@ -784,11 +789,12 @@ static int __devinit m25p_probe(struct s dev_set_drvdata(&spi->dev, flash); /* diff --git a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch index b4eab674a9..52f54e6ce8 100644 --- a/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch +++ b/target/linux/ar71xx/patches-2.6.32/109-mtd-wrt160nl-trx-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -890,6 +890,16 @@ static int __devinit m25p_probe(struct s +@@ -885,6 +885,16 @@ static int __devinit m25p_probe(struct s part_probes, &parts, 0); } #endif diff --git a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch b/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch index 0e4c060db7..5f44c1d696 100644 --- a/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch +++ b/target/linux/ar71xx/patches-2.6.32/112-mtd-m25p80-add-w25q32-chip-support.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -692,6 +692,7 @@ static struct flash_info __devinitdata m +@@ -687,6 +687,7 @@ static struct flash_info __devinitdata m { "w25x80", 0xef3014, 0, 64 * 1024, 16, SECT_4K, }, { "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, }, { "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, }, |