aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-4.1
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/lantiq/patches-4.1')
-rw-r--r--target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 1f0ffe1bcf..535069c58d 100644
--- a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
@@ -22,7 +22,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
-@@ -184,6 +185,10 @@ static int m25p_probe(struct spi_device
+@@ -182,6 +183,10 @@ static int m25p_probe(struct spi_device
enum read_mode mode = SPI_NOR_NORMAL;
char *flash_name = NULL;
int ret;
@@ -33,10 +33,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
data = dev_get_platdata(&spi->dev);
-@@ -215,6 +220,8 @@ static int m25p_probe(struct spi_device
+@@ -212,6 +217,8 @@ static int m25p_probe(struct spi_device
if (data && data->name)
- flash->mtd.name = data->name;
+ nor->mtd.name = data->name;
+ else if (of_mtd_name)
+ flash->mtd.name = of_mtd_name;