kernel: bump 4.19 to 4.19.86

[openwrt/staging/rmilecki.git] / target / linux / gemini / patches-4.19 / 0005-mtd-physmap_of-Move-custom-initialization.patch

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 5462844a790ca5c0139ffe60d079be5e390dff4c..1af8a0399523000e4cbb55286bb0bcd6e5f1dab8 100644 (file)
--- 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)