diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-02-23 17:33:21 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2018-02-26 19:20:06 +0100 |
| commit | a49f6565b34c7defbe66cd03c2cb04752ec4dbe6 (patch) | |
| tree | 5f9c2c58638362ad0408b732c565bd3a3cc8fb21 /target/linux/lantiq | |
| parent | 25aaff9100065dba881be71b9dcab1e9cc8a7b5f (diff) | |
| download | upstream-a49f6565b34c7defbe66cd03c2cb04752ec4dbe6.tar.gz upstream-a49f6565b34c7defbe66cd03c2cb04752ec4dbe6.tar.bz2 upstream-a49f6565b34c7defbe66cd03c2cb04752ec4dbe6.zip | |
kernel: m25p80: allow fallback from spi_flash_read to regular SPI transfer
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/lantiq')
| -rw-r--r-- | target/linux/lantiq/patches-4.14/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-4.9/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 4 |
2 files changed, 4 insertions, 4 deletions
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 <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; 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 <blogic@openwrt.org> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> -@@ -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 <blogic@openwrt.org> 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; |