openwrt/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch
Koen Vandeputte f19e471f32 kernel: bump 4.19 to 4.19.86
Refreshed all patches.

Altered patches:
- 950-0064-mfd-Add-Raspberry-Pi-Sense-HAT-core-driver.patch
- 0005-mtd-physmap_of-Move-custom-initialization.patch

Remove upstreamed:
- 0001-pinctrl-gemini-Mask-and-set-properly.patch
- 0002-pinctrl-gemini-Fix-up-TVC-clock-group.patch

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2019-11-29 09:59:49 +01:00

38 lines
1.3 KiB
Diff

From 58ecb60d53d43e8d584708722a2cf851ba88f9e1 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
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 <linus.walleij@linaro.org>
---
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
@@ -231,6 +231,9 @@ static int of_flash_probe(struct platfor
else if (of_property_read_bool(dp, "little-endian"))
info->list[i].map.swap = CFI_LITTLE_ENDIAN;
+ 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;
@@ -238,8 +241,6 @@ static int of_flash_probe(struct platfor
if (err)
goto err_out;
- simple_map_init(&info->list[i].map);
-
/*
* On some platforms (e.g. MPC5200) a direct 1:1 mapping
* may cause problems with JFFS2 usage, as the local bus (LPB)