--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -251,7 +251,9 @@ static int m25p_probe(struct spi_device
 
 	ppdata.of_node = spi->dev.of_node;
 
-	return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
+	return mtd_device_parse_register(&nor->mtd,
+			data ? data->part_probes : NULL,
+			&ppdata,
 			data ? data->parts : NULL,
 			data ? data->nr_parts : 0);
 }
--- 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 */
 };
