ar71xx: drop the mx25lxxx patch, these chips are supported in 2.6.32.7 already
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19545 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
053093dfe7
commit
a034844a21
|
@ -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 },
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/drivers/mtd/devices/m25p80.c
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
+++ b/drivers/mtd/devices/m25p80.c
|
||||||
@@ -635,6 +635,11 @@ static struct flash_info __devinitdata m
|
@@ -630,6 +630,11 @@ static struct flash_info __devinitdata m
|
||||||
{ "mx25l64", 0xc22017, 0, 64 * 1024, 128, },
|
{ "en25p32", 0x1c2016, 0, 64 * 1024, 64, },
|
||||||
{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
|
{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
|
||||||
|
|
||||||
+ /* Numonyx -- xxxs33b */
|
+ /* Numonyx -- xxxs33b */
|
||||||
+ { "160s33b", 0x898911, 0, 64 * 1024, 64, },
|
+ { "160s33b", 0x898911, 0, 64 * 1024, 64, },
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
|
/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
|
||||||
{ "pm25lv512", 0, 32 * 1024, 2, SECT_4K },
|
{ "pm25lv512", 0, 32 * 1024, 2, SECT_4K },
|
||||||
{ "pm25lv010", 0, 32 * 1024, 4, 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);
|
dev_set_drvdata(&spi->dev, flash);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/mtd/devices/m25p80.c
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
+++ b/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);
|
part_probes, &parts, 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/drivers/mtd/devices/m25p80.c
|
--- a/drivers/mtd/devices/m25p80.c
|
||||||
+++ b/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, },
|
{ "w25x80", 0xef3014, 0, 64 * 1024, 16, SECT_4K, },
|
||||||
{ "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, },
|
{ "w25x16", 0xef3015, 0, 64 * 1024, 32, SECT_4K, },
|
||||||
{ "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },
|
{ "w25x32", 0xef3016, 0, 64 * 1024, 64, SECT_4K, },
|
||||||
|
|
Loading…
Reference in New Issue