kernel: backport mtd patches with Broadcom of_match_table-s
Two tiny & trivial patches with no regression risk. One simplifies bcm53xx downstream patch. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki
parent
af4b23dde2
commit
6bcafea2c0
5 changed files with 168 additions and 19 deletions
|
|
@ -32,22 +32,3 @@ Subject: [PATCH] Use "brcm,bcm947xx-cfe-partitions" binding for Broadcom
|
|||
};
|
||||
};
|
||||
|
||||
--- a/drivers/mtd/bcm47xxpart.c
|
||||
+++ b/drivers/mtd/bcm47xxpart.c
|
||||
@@ -314,9 +314,16 @@ static int bcm47xxpart_parse(struct mtd_
|
||||
return curr_part;
|
||||
};
|
||||
|
||||
+static const struct of_device_id bcm47xxpart_of_match_table[] = {
|
||||
+ { .compatible = "brcm,bcm947xx-cfe-partitions" },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
|
||||
+
|
||||
static struct mtd_part_parser bcm47xxpart_mtd_parser = {
|
||||
.parse_fn = bcm47xxpart_parse,
|
||||
.name = "bcm47xxpart",
|
||||
+ .of_match_table = bcm47xxpart_of_match_table,
|
||||
};
|
||||
module_mtd_part_parser(bcm47xxpart_mtd_parser);
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
From cf589ce71e84d3b8811c65740645af254c5248c0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Wed, 9 May 2018 10:17:29 +0200
|
||||
Subject: [PATCH] mtd: bcm47xxpart: add of_match_table with a new DT binding
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This allows using bcm47xxpart parser to find partitions on flash
|
||||
described in DT using the "brcm,bcm947xx-cfe-partitions" compatible
|
||||
property. It means this parser doesn't have to be explicitly selected by
|
||||
a flash driver anymore. It can be used e.g. together with a generic
|
||||
m25p80 / spi-nor if device is just properly described.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
---
|
||||
drivers/mtd/bcm47xxpart.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
--- a/drivers/mtd/bcm47xxpart.c
|
||||
+++ b/drivers/mtd/bcm47xxpart.c
|
||||
@@ -304,9 +304,16 @@ static int bcm47xxpart_parse(struct mtd_
|
||||
return curr_part;
|
||||
};
|
||||
|
||||
+static const struct of_device_id bcm47xxpart_of_match_table[] = {
|
||||
+ { .compatible = "brcm,bcm947xx-cfe-partitions" },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
|
||||
+
|
||||
static struct mtd_part_parser bcm47xxpart_mtd_parser = {
|
||||
.parse_fn = bcm47xxpart_parse,
|
||||
.name = "bcm47xxpart",
|
||||
+ .of_match_table = bcm47xxpart_of_match_table,
|
||||
};
|
||||
module_mtd_part_parser(bcm47xxpart_mtd_parser);
|
||||
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
From 98534a58c8a40cdc9e3bcb04d74719fbcedfeb52 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Tue, 26 Jun 2018 00:05:08 +0200
|
||||
Subject: [PATCH] mtd: parsers: trx: add of_match_table with the new DT binding
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This allows using TRX parser to find TRX partitions on flash device
|
||||
described in DT using a proper binding. It's useful for devices storing
|
||||
firmware on a separated flash and having rootfs partition in it.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
---
|
||||
drivers/mtd/parsers/parser_trx.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
--- a/drivers/mtd/parsers/parser_trx.c
|
||||
+++ b/drivers/mtd/parsers/parser_trx.c
|
||||
@@ -116,9 +116,16 @@ static int parser_trx_parse(struct mtd_i
|
||||
return i;
|
||||
};
|
||||
|
||||
+static const struct of_device_id mtd_parser_trx_of_match_table[] = {
|
||||
+ { .compatible = "brcm,trx" },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, mtd_parser_trx_of_match_table);
|
||||
+
|
||||
static struct mtd_part_parser mtd_parser_trx = {
|
||||
.parse_fn = parser_trx_parse,
|
||||
.name = "trx",
|
||||
+ .of_match_table = mtd_parser_trx_of_match_table,
|
||||
};
|
||||
module_mtd_part_parser(mtd_parser_trx);
|
||||
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
From cf589ce71e84d3b8811c65740645af254c5248c0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Wed, 9 May 2018 10:17:29 +0200
|
||||
Subject: [PATCH] mtd: bcm47xxpart: add of_match_table with a new DT binding
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This allows using bcm47xxpart parser to find partitions on flash
|
||||
described in DT using the "brcm,bcm947xx-cfe-partitions" compatible
|
||||
property. It means this parser doesn't have to be explicitly selected by
|
||||
a flash driver anymore. It can be used e.g. together with a generic
|
||||
m25p80 / spi-nor if device is just properly described.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
---
|
||||
drivers/mtd/bcm47xxpart.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
--- a/drivers/mtd/bcm47xxpart.c
|
||||
+++ b/drivers/mtd/bcm47xxpart.c
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
+#include <linux/mod_devicetable.h>
|
||||
|
||||
#include <uapi/linux/magic.h>
|
||||
|
||||
@@ -304,9 +305,16 @@ static int bcm47xxpart_parse(struct mtd_
|
||||
return curr_part;
|
||||
};
|
||||
|
||||
+static const struct of_device_id bcm47xxpart_of_match_table[] = {
|
||||
+ { .compatible = "brcm,bcm947xx-cfe-partitions" },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, bcm47xxpart_of_match_table);
|
||||
+
|
||||
static struct mtd_part_parser bcm47xxpart_mtd_parser = {
|
||||
.parse_fn = bcm47xxpart_parse,
|
||||
.name = "bcm47xxpart",
|
||||
+ .of_match_table = bcm47xxpart_of_match_table,
|
||||
};
|
||||
module_mtd_part_parser(bcm47xxpart_mtd_parser);
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From 98534a58c8a40cdc9e3bcb04d74719fbcedfeb52 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Tue, 26 Jun 2018 00:05:08 +0200
|
||||
Subject: [PATCH] mtd: parsers: trx: add of_match_table with the new DT binding
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This allows using TRX parser to find TRX partitions on flash device
|
||||
described in DT using a proper binding. It's useful for devices storing
|
||||
firmware on a separated flash and having rootfs partition in it.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
|
||||
---
|
||||
drivers/mtd/parsers/parser_trx.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
--- a/drivers/mtd/parsers/parser_trx.c
|
||||
+++ b/drivers/mtd/parsers/parser_trx.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
+#include <linux/mod_devicetable.h>
|
||||
|
||||
#define TRX_PARSER_MAX_PARTS 4
|
||||
|
||||
@@ -116,9 +117,16 @@ static int parser_trx_parse(struct mtd_i
|
||||
return i;
|
||||
};
|
||||
|
||||
+static const struct of_device_id mtd_parser_trx_of_match_table[] = {
|
||||
+ { .compatible = "brcm,trx" },
|
||||
+ {},
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(of, mtd_parser_trx_of_match_table);
|
||||
+
|
||||
static struct mtd_part_parser mtd_parser_trx = {
|
||||
.parse_fn = parser_trx_parse,
|
||||
.name = "trx",
|
||||
+ .of_match_table = mtd_parser_trx_of_match_table,
|
||||
};
|
||||
module_mtd_part_parser(mtd_parser_trx);
|
||||
|
||||
Loading…
Reference in a new issue