diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-11-24 18:59:28 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-11-24 18:59:28 +0000 |
| commit | eb573cc84f1e3cf86b95bab720ba99a45abf13b2 (patch) | |
| tree | b9a70f4c86488c7289d2eea5e4759412966648f2 /target/linux/lantiq/patches-4.1 | |
| parent | 39dd97633fb57b95f053e9e25c145b9a44e1fd6e (diff) | |
| download | master-187ad058-eb573cc84f1e3cf86b95bab720ba99a45abf13b2.tar.gz master-187ad058-eb573cc84f1e3cf86b95bab720ba99a45abf13b2.tar.bz2 master-187ad058-eb573cc84f1e3cf86b95bab720ba99a45abf13b2.zip | |
kernel: update m25p80 in 4.1 to the latest version from 4.4-rc1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47624 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-4.1')
| -rw-r--r-- | target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch index 1f0ffe1bcf..535069c58d 100644 --- a/target/linux/lantiq/patches-4.1/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch +++ b/target/linux/lantiq/patches-4.1/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> -@@ -184,6 +185,10 @@ static int m25p_probe(struct spi_device +@@ -182,6 +183,10 @@ static int m25p_probe(struct spi_device enum read_mode mode = SPI_NOR_NORMAL; char *flash_name = NULL; int ret; @@ -33,10 +33,10 @@ Signed-off-by: John Crispin <blogic@openwrt.org> data = dev_get_platdata(&spi->dev); -@@ -215,6 +220,8 @@ static int m25p_probe(struct spi_device +@@ -212,6 +217,8 @@ static int m25p_probe(struct spi_device if (data && data->name) - flash->mtd.name = data->name; + nor->mtd.name = data->name; + else if (of_mtd_name) + flash->mtd.name = of_mtd_name; |