From ac9bcefa3b044bf556af37a4c6b06e350a3d43c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 14 Mar 2018 15:07:03 +0100 Subject: kernel: use V10 of mtd patchset adding support for "compatible" string MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the commit bde5e7a632ef0 ("kernel: backport mtd implementation for "compatible" in "partitions" subnode") patches that got accepted into l2-mtd.git were backported to the kernels 4.9 and 4.14. Unfortunately there was a regression report, patches were dropped and never reached 4.16. This commit replaces these pseudo-backports with the latest version that includes regression fix and futher changes that were requested. Signed-off-by: Rafał Miłecki --- ...-add-of_match_table-with-fixed-partitions.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 target/linux/generic/backport-4.9/067-v4.17-0002-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch (limited to 'target/linux/generic/backport-4.9/067-v4.17-0002-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch') diff --git a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch b/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch deleted file mode 100644 index 2092cc28fd..0000000000 --- a/target/linux/generic/backport-4.9/067-v4.17-0002-mtd-ofpart-add-of_match_table-with-fixed-partitions.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4ac9222778478a00c7fc9d347b7ed1e0e595120d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 4 Jan 2018 08:05:34 +0100 -Subject: [PATCH] mtd: ofpart: add of_match_table with "fixed-partitions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This allows using this parser with any flash driver that takes care of -setting of_node (using mtd_set_of_node helper) correctly. Up to now -support for "fixed-partitions" DT compatibility string was working only -with flash drivers that were specifying "ofpart" (manually or by letting -mtd use the default set of parsers). - -This matches existing bindings documentation. - -Signed-off-by: Rafał Miłecki -Reviewed-by: Brian Norris -Tested-by: Brian Norris -Signed-off-by: Boris Brezillon ---- - drivers/mtd/ofpart.c | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/mtd/ofpart.c -+++ b/drivers/mtd/ofpart.c -@@ -140,9 +140,16 @@ ofpart_none: - return ret; - } - -+static const struct of_device_id parse_ofpart_match_table[] = { -+ { .compatible = "fixed-partitions" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, parse_ofpart_match_table); -+ - static struct mtd_part_parser ofpart_parser = { - .parse_fn = parse_ofpart_partitions, - .name = "ofpart", -+ .of_match_table = parse_ofpart_match_table, - }; - - static int parse_ofoldpart_partitions(struct mtd_info *master, -- cgit v1.2.3