From 4b2fe12953e173df90a36326ae92486331594f4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 2 Jun 2020 09:02:23 +0200 Subject: [PATCH] kernel: mtdsplit: bcm_wfi: remove brcm,wfi-sercomm compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The only Sercomm WFI user has been migrated to a dedicated firmware parser. Keep support for no cferam partition based on a boolean DT property. Signed-off-by: Álvaro Fernández Rojas --- .../generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c index 7eb6526f9e4..4e46ded587f 100644 --- a/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c +++ b/target/linux/generic/files/drivers/mtd/mtdsplit/mtdsplit_bcm_wfi.c @@ -150,7 +150,7 @@ static int mtdsplit_parse_bcm_wfi(struct mtd_info *master, if (!mtd_node) return -EINVAL; - if (of_device_is_compatible(mtd_node, "brcm,wfi-sercomm")) + if (of_property_read_bool(mtd_node, "brcm,no-cferam")) cfe_part = false; if (cfe_part) { @@ -215,7 +215,6 @@ static int mtdsplit_parse_bcm_wfi(struct mtd_info *master, static const struct of_device_id mtdsplit_bcm_wfi_of_match[] = { { .compatible = "brcm,wfi" }, - { .compatible = "brcm,wfi-sercomm" }, { }, }; -- 2.30.2