diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-08 09:54:51 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-08-08 09:54:51 +0200 |
commit | e3ab280e47000aee3dc0ea916bcb656490e9839d (patch) | |
tree | 4e61f399b6624044b76e9437660eea975345080f /target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch | |
parent | 5742a2ba35e20b7fe7ca9aac3ceb42e0a4f37ca0 (diff) | |
download | upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.tar.gz upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.tar.bz2 upstream-e3ab280e47000aee3dc0ea916bcb656490e9839d.zip |
kernel: remove linux 3.18 support
No targets are using it anymore
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch')
-rw-r--r-- | target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch b/target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch deleted file mode 100644 index 24c264ba97..0000000000 --- a/target/linux/generic/pending-3.18/044-backport-m25p80-jedec-probe.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/drivers/mtd/devices/m25p80.c -+++ b/drivers/mtd/devices/m25p80.c -@@ -310,11 +310,21 @@ static const struct spi_device_id m25p_i - }; - MODULE_DEVICE_TABLE(spi, m25p_ids); - -+static const struct of_device_id m25p_of_table[] = { -+ /* -+ * Generic compatibility for SPI NOR that can be identified by the -+ * JEDEC READ ID opcode (0x9F). Use this, if possible. -+ */ -+ { .compatible = "jedec,spi-nor" }, -+ {} -+}; -+MODULE_DEVICE_TABLE(of, m25p_of_table); - - static struct spi_driver m25p80_driver = { - .driver = { - .name = "m25p80", - .owner = THIS_MODULE, -+ .of_match_table = m25p_of_table, - }, - .id_table = m25p_ids, - .probe = m25p_probe, ---- a/drivers/mtd/spi-nor/spi-nor.c -+++ b/drivers/mtd/spi-nor/spi-nor.c -@@ -934,8 +934,11 @@ int spi_nor_scan(struct spi_nor *nor, co - if (ret) - return ret; - -- id = spi_nor_match_id(name); -+ if (name) -+ id = spi_nor_match_id(name); - if (!id) -+ id = nor->read_id(nor); -+ if (IS_ERR_OR_NULL(id)) - return -ENOENT; - - info = (void *)id->driver_data; |