kernel: bump 5.15 to 5.15.133

[openwrt/openwrt.git] / target / linux / bcm47xx / patches-5.15 / 100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch

diff --git a/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch b/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch
index ce14834fa71b6312c30462b0473de9be0188540a..30b6d97a8582dd9bf89ed9841a3113353f8f1e81 100644 (file)
--- a/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch
+++ b/target/linux/bcm47xx/patches-5.15/100-v5.18-mtd-rawnand-brcmnand-Assign-soc-as-early-as-possible.patch
@@ -14,15 +14,15 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
 
 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
-@@ -3033,6 +3033,7 @@ int brcmnand_probe(struct platform_devic
+@@ -3059,6 +3059,7 @@ int brcmnand_probe(struct platform_devic
  
        dev_set_drvdata(dev, ctrl);
        ctrl->dev = dev;
 +      ctrl->soc = soc;
  
-       init_completion(&ctrl->done);
-       init_completion(&ctrl->dma_done);
-@@ -3173,8 +3174,6 @@ int brcmnand_probe(struct platform_devic
+       /* Enable the static key if the soc provides I/O operations indicating
+        * that a non-memory mapped IO access path must be used
+@@ -3205,8 +3206,6 @@ int brcmnand_probe(struct platform_devic
         * interesting ways
         */
        if (soc) {