From: Miquel Raynal <miquel.raynal@bootlin.com>
Date: Thu, 21 Nov 2024 16:04:19 +0000 (+0100)
Subject: Merge tag 'nand/for-6.13' into mtd/next
X-Git-Tag: microblaze-v6.16~573^2
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=944477516bda30bc11e2c30e355da8dd6df48aaf;p=linux-2.6-microblaze.git

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.
---

944477516bda30bc11e2c30e355da8dd6df48aaf
diff --cc drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 706a5d79a057,cab6d7b4f4dd..d76802944453
--- a/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);