ar71xx: allow to pass part_probe types to the m25p80 driver

SVN-Revision: 29411
This commit is contained in:
Gabor Juhos 2011-12-03 18:13:18 +00:00
parent 20483faed0
commit c8acd6e013
4 changed files with 28 additions and 5 deletions

View File

@ -0,0 +1,23 @@
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -968,6 +968,10 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0);
}
+ if (nr_parts <= 0 && data && data->part_probes)
+ nr_parts = parse_mtd_partitions(&flash->mtd,
+ data->part_probes, &parts, 0);
+
if (nr_parts <= 0 && data && data->parts) {
parts = data->parts;
nr_parts = data->nr_parts;
--- a/include/linux/spi/flash.h
+++ b/include/linux/spi/flash.h
@@ -24,6 +24,7 @@ struct flash_platform_data {
unsigned int nr_parts;
char *type;
+ const char **part_probes;
/* we'll likely add more ... use JEDEC IDs, etc */
};

View File

@ -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
@@ -968,6 +968,16 @@ static int __devinit m25p_probe(struct s @@ -972,6 +972,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0); nr_parts = parse_mtd_partitions(&flash->mtd,
} data->part_probes, &parts, 0);
+#ifdef CONFIG_MTD_MYLOADER_PARTS +#ifdef CONFIG_MTD_MYLOADER_PARTS
+ if (nr_parts <= 0) { + if (nr_parts <= 0) {

View File

@ -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
@@ -978,6 +978,15 @@ static int __devinit m25p_probe(struct s @@ -982,6 +982,15 @@ static int __devinit m25p_probe(struct s
} }
#endif #endif

View File

@ -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
@@ -987,6 +987,16 @@ static int __devinit m25p_probe(struct s @@ -991,6 +991,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0); part_probes, &parts, 0);
} }
#endif #endif