kernel: bump 5.15 to 5.15.133
[openwrt/staging/stintel.git] / target / linux / bcm47xx / patches-5.15 / 103-v5.18-mtd-rawnand-brcmnand-Move-OF-operations-out-of-brcmnand_init_cs.patch
index 2e2c05a43244adffb40ff613766a1c26b005871d..6a17ea7182ab8ed9c859c08ea43e09ded2bf01ef 100644 (file)
@@ -17,7 +17,7 @@ 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
-@@ -2803,7 +2803,7 @@ static const struct nand_controller_ops
+@@ -2811,7 +2811,7 @@ static const struct nand_controller_ops
        .attach_chip = brcmnand_attach_chip,
  };
  
@@ -26,7 +26,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
  {
        struct brcmnand_controller *ctrl = host->ctrl;
        struct device *dev = ctrl->dev;
-@@ -2812,16 +2812,9 @@ static int brcmnand_init_cs(struct brcmn
+@@ -2820,16 +2820,9 @@ static int brcmnand_init_cs(struct brcmn
        int ret;
        u16 cfg_offs;
  
@@ -43,7 +43,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
        nand_set_controller_data(chip, host);
        mtd->name = devm_kasprintf(dev, GFP_KERNEL, "brcmnand.%d",
                                   host->cs);
-@@ -3228,7 +3221,16 @@ int brcmnand_probe(struct platform_devic
+@@ -3236,7 +3229,16 @@ int brcmnand_probe(struct platform_devic
                        host->pdev = pdev;
                        host->ctrl = ctrl;