kernel: m25p80: allow fallback from spi_flash_read to regular SPI transfer

[openwrt/openwrt.git] / target / linux / lantiq / patches-4.14 / 0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch

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 6cd456a781ec586f3c48bbbf088bc4bf1451cbcc..415c8579bdf7ee5483381d58a8e9bdfba81bc13d 100644 (file)
--- 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 <blogic@openwrt.org>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
-@@ -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 <blogic@openwrt.org>
  
        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;