aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-02-12 11:15:56 +0000
committerJohn Crispin <john@openwrt.org>2015-02-12 11:15:56 +0000
commitdbfb21ee900c5d6ac39ec2e40df3545c3fa649a7 (patch)
treead1eca795dd58bc5e896de2fd7db492636fe4558 /target/linux/lantiq
parent1eb616764e5bb799b5a62fd717cf8cd0c07281f9 (diff)
downloadupstream-dbfb21ee900c5d6ac39ec2e40df3545c3fa649a7.tar.gz
upstream-dbfb21ee900c5d6ac39ec2e40df3545c3fa649a7.tar.bz2
upstream-dbfb21ee900c5d6ac39ec2e40df3545c3fa649a7.zip
lantiq: make m25p80 work again
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44421
Diffstat (limited to 'target/linux/lantiq')
-rw-r--r--target/linux/lantiq/config-3.182
-rw-r--r--target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch12
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 <blogic@openwrt.org>
--- 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 <linux/errno.h>
+ #include <linux/module.h>
+ #include <linux/device.h>
++#include <linux/of.h>
+
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+@@ -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 <blogic@openwrt.org>
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;