| Message ID | 20210418214616.239574-3-hauke@hauke-m.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | mtd: parsers: trx: Add support for Buffalo WSR-2533DHP2 | expand |
On Sun, 2021-04-18 at 21:46:15 UTC, Hauke Mehrtens wrote: > Buffalo uses a different TRX magic for every device, to be able to use > this trx parser, make it possible to specify the TRX magic in device > tree. If no TRX magic is specified in device tree, the standard value > will be used. This value should only be specified if a vendor chooses to > use a non standard TRX magic. > > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Applied to https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/next, thanks. Miquel
diff --git a/drivers/mtd/parsers/parser_trx.c b/drivers/mtd/parsers/parser_trx.c index 8541182134d4..4814cf218e17 100644 --- a/drivers/mtd/parsers/parser_trx.c +++ b/drivers/mtd/parsers/parser_trx.c @@ -51,13 +51,20 @@ static int parser_trx_parse(struct mtd_info *mtd, const struct mtd_partition **pparts, struct mtd_part_parser_data *data) { + struct device_node *np = mtd_get_of_node(mtd); struct mtd_partition *parts; struct mtd_partition *part; struct trx_header trx; size_t bytes_read; uint8_t curr_part = 0, i = 0; + uint32_t trx_magic = TRX_MAGIC; int err; + /* Get different magic from device tree if specified */ + err = of_property_read_u32(np, "brcm,trx-magic", &trx_magic); + if (err != 0 && err != -EINVAL) + pr_err("failed to parse \"brcm,trx-magic\" DT attribute, using default: %d\n", err); + parts = kcalloc(TRX_PARSER_MAX_PARTS, sizeof(struct mtd_partition), GFP_KERNEL); if (!parts) @@ -70,7 +77,7 @@ static int parser_trx_parse(struct mtd_info *mtd, return err; } - if (trx.magic != TRX_MAGIC) { + if (trx.magic != trx_magic) { kfree(parts); return -ENOENT; }
Buffalo uses a different TRX magic for every device, to be able to use this trx parser, make it possible to specify the TRX magic in device tree. If no TRX magic is specified in device tree, the standard value will be used. This value should only be specified if a vendor chooses to use a non standard TRX magic. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- drivers/mtd/parsers/parser_trx.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)