Merge tag 'nand/for-6.13' into mtd/next

SPI-NAND changes:
A load of fixes to Winbond manufacturer driver have been done, plus a
structure constification.

Raw NAND changes:
The GPMI driver has been improved on the power management side.
The Davinci driver has been cleaned up.
A leak in the Atmel driver plus some typos in the core have been fixed.

diff --cc drivers/mtd/nand/ecc-mxic.c
Simple merge

diff --cc drivers/mtd/nand/raw/cadence-nand-controller.c
Simple merge

diff --cc drivers/mtd/nand/raw/davinci_nand.c
Simple merge

diff --cc drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 706a5d79a057cdc4abf9064078fe5f1750685e72,cab6d7b4f4dd60dacb9db408b61479e743aa7b7b..d768029444533043da09083141db10ebdc236fb9
--- 1/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
--- 2/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@@ -2873,11 -2878,11 +2878,11 @@@ static const struct dev_pm_ops gpmi_pm_
  static struct platform_driver gpmi_nand_driver = {
        .driver = {
                .name = "gpmi-nand",
-               .pm = &gpmi_pm_ops,
+               .pm = pm_ptr(&gpmi_pm_ops),
                .of_match_table = gpmi_nand_id_table,
        },
 -      .probe   = gpmi_nand_probe,
 -      .remove_new = gpmi_nand_remove,
 +      .probe = gpmi_nand_probe,
 +      .remove = gpmi_nand_remove,
  };
  module_platform_driver(gpmi_nand_driver);
  

diff --cc drivers/mtd/nand/raw/pl35x-nand-controller.c
Simple merge

diff --cc drivers/spi/spi-mxic.c
Simple merge