mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
ac9bcefa3b
In the commit bde5e7a632 ("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 <rafal@milecki.pl>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 4 Jan 2018 08:05:34 +0100
|
|
Subject: [PATCH V10 3/3] 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 <rafal@milecki.pl>
|
|
Reviewed-by: Brian Norris <computersforpeace@gmail.com>
|
|
Tested-by: Brian Norris <computersforpeace@gmail.com>
|
|
---
|
|
|
|
--- 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_fixed_partitions,
|
|
.name = "fixed-partitions",
|
|
+ .of_match_table = parse_ofpart_match_table,
|
|
};
|
|
|
|
static int parse_ofoldpart_partitions(struct mtd_info *master,
|