From 58ecb60d53d43e8d584708722a2cf851ba88f9e1 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 11 Oct 2018 19:53:40 +0200 Subject: [PATCH 05/18] mtd: physmap_of: Move custom initialization In order to be able to assign custom complex mappings to the physmap_of plugin for Gemini, move the initialization so that the simple map is initialized before we enter the platform-specific functions so the latter can override them. Signed-off-by: Linus Walleij --- drivers/mtd/maps/physmap_of_core.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) --- a/drivers/mtd/maps/physmap_of_core.c +++ b/drivers/mtd/maps/physmap_of_core.c @@ -239,13 +239,6 @@ static int of_flash_probe(struct platfor else if (of_property_read_bool(dp, "little-endian")) info->list[i].map.swap = CFI_LITTLE_ENDIAN; - err = of_flash_probe_gemini(dev, dp, &info->list[i].map); - if (err) - goto err_out; - err = of_flash_probe_versatile(dev, dp, &info->list[i].map); - if (err) - goto err_out; - err = -ENOMEM; info->list[i].map.virt = ioremap(info->list[i].map.phys, info->list[i].map.size); @@ -257,6 +250,14 @@ static int of_flash_probe(struct platfor simple_map_init(&info->list[i].map); + /* Variants can override map accessors */ + err = of_flash_probe_gemini(dev, dp, &info->list[i].map); + if (err) + goto err_out; + err = of_flash_probe_versatile(dev, dp, &info->list[i].map); + if (err) + goto err_out; + /* * On some platforms (e.g. MPC5200) a direct 1:1 mapping * may cause problems with JFFS2 usage, as the local bus (LPB)