From dbfb21ee900c5d6ac39ec2e40df3545c3fa649a7 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 12 Feb 2015 11:15:56 +0000 Subject: [PATCH] lantiq: make m25p80 work again Signed-off-by: John Crispin SVN-Revision: 44421 --- target/linux/lantiq/config-3.18 | 2 ++ ...2-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/target/linux/lantiq/config-3.18 b/target/linux/lantiq/config-3.18 index f5220ceff8..148d104151 100644 --- a/target/linux/lantiq/config-3.18 +++ b/target/linux/lantiq/config-3.18 @@ -102,7 +102,9 @@ CONFIG_MTD_CFI_GEOMETRY=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_LANTIQ=y +CONFIG_MTD_M25P80=y # CONFIG_MTD_NAND_XWAY is not set +CONFIG_MTD_SPI_NOR=y CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_NEED_DMA_MAP_STATE=y diff --git a/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 04a858ff6a..98fe4c2b77 100644 --- a/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -14,7 +14,15 @@ Signed-off-by: John Crispin --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -198,6 +198,10 @@ static int m25p_probe(struct spi_device +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -198,6 +199,10 @@ enum read_mode mode = SPI_NOR_NORMAL; char *flash_name = NULL; int ret; @@ -25,7 +33,7 @@ Signed-off-by: John Crispin data = dev_get_platdata(&spi->dev); -@@ -229,6 +233,8 @@ static int m25p_probe(struct spi_device +@@ -229,6 +234,8 @@ if (data && data->name) flash->mtd.name = data->name; -- 2.25.1