From a49f6565b34c7defbe66cd03c2cb04752ec4dbe6 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 23 Feb 2018 17:33:21 +0100 Subject: kernel: m25p80: allow fallback from spi_flash_read to regular SPI transfer Signed-off-by: Felix Fietkau --- .../patches-4.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 ++-- .../patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/lantiq') diff --git a/target/linux/lantiq/patches-4.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 6cd456a781..415c8579bd 100644 --- a/target/linux/lantiq/patches-4.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-4.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: John Crispin #include #include -@@ -243,6 +244,10 @@ static int m25p_probe(struct spi_device +@@ -245,6 +246,10 @@ static int m25p_probe(struct spi_device }; char *flash_name; int ret; @@ -33,7 +33,7 @@ Signed-off-by: John Crispin data = dev_get_platdata(&spi->dev); -@@ -281,6 +286,8 @@ static int m25p_probe(struct spi_device +@@ -283,6 +288,8 @@ static int m25p_probe(struct spi_device if (data && data->name) nor->mtd.name = data->name; diff --git a/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index f08db65046..7617c14ddb 100644 --- a/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: John Crispin #include #include -@@ -198,6 +199,10 @@ static int m25p_probe(struct spi_device +@@ -200,6 +201,10 @@ static int m25p_probe(struct spi_device enum read_mode mode = SPI_NOR_NORMAL; char *flash_name; int ret; @@ -33,7 +33,7 @@ Signed-off-by: John Crispin data = dev_get_platdata(&spi->dev); -@@ -227,6 +232,8 @@ static int m25p_probe(struct spi_device +@@ -229,6 +234,8 @@ static int m25p_probe(struct spi_device if (data && data->name) nor->mtd.name = data->name; -- cgit v1.2.3