diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-25 11:32:08 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-11-29 09:59:49 +0100 |
| commit | f19e471f3206d0b5885490e52972085d2da2a10b (patch) | |
| tree | d57ce28632cc05db523fe9c1d8f85f9c2953e5c1 /target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch | |
| parent | 414b7c107aaa0e037b3f352e0650bbc429db41a7 (diff) | |
| download | upstream-f19e471f3206d0b5885490e52972085d2da2a10b.tar.gz upstream-f19e471f3206d0b5885490e52972085d2da2a10b.tar.bz2 upstream-f19e471f3206d0b5885490e52972085d2da2a10b.zip | |
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>
Diffstat (limited to 'target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch')
| -rw-r--r-- | target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch b/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch index 5462844a79..1af8a03995 100644 --- a/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch +++ b/target/linux/gemini/patches-4.19/0005-mtd-physmap_of-Move-custom-initialization.patch @@ -16,32 +16,22 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- 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 +@@ -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; -- 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; ++ 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) |