Merge tag 'nand/for-6.4' into mtd/next
authorMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 19 Apr 2023 18:38:54 +0000 (20:38 +0200)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Wed, 19 Apr 2023 18:39:03 +0000 (20:39 +0200)
Raw NAND core changes:
* Convert to platform remove callback returning void
* Fix spelling mistake waifunc() -> waitfunc()

Raw NAND controller driver changes:
* imx: Remove unused is_imx51_nfc and imx53_nfc functions
* omap2: Drop obsolete dependency on COMPILE_TEST
* orion: Use devm_platform_ioremap_resource()
* qcom:
  - Use of_property_present() for testing DT property presence
  - Use devm_platform_get_and_ioremap_resource()
* stm32_fmc2: Depends on ARCH_STM32 instead of MACH_STM32MP157
* tmio: Remove reference to config MTD_NAND_TMIO in the parsers

Raw NAND manufacturer driver changes:
* hynix: Fix up bit 0 of sdr_timing_mode

SPI-NAND changes:
* Add support for ESMT F50x1G41LB

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
1  2 
drivers/mtd/nand/raw/fsmc_nand.c

index 0d34d433b732e372ed2a0ef8f412784a98ee1879,d5786708907924a4924d8310e2d98b166c7c7bb9..7b4742420dfcb85a89c538fcef028222a90b136b
@@@ -880,7 -880,7 +880,7 @@@ static int fsmc_nand_probe_config_dt(st
                }
        }
  
 -      if (of_get_property(np, "nand-skip-bbtscan", NULL))
 +      if (of_property_read_bool(np, "nand-skip-bbtscan"))
                nand->options |= NAND_SKIP_BBTSCAN;
  
        host->dev_timings = devm_kzalloc(&pdev->dev,
@@@ -1165,7 -1165,7 +1165,7 @@@ disable_clk
  /*
   * Clean up routine
   */
- static int fsmc_nand_remove(struct platform_device *pdev)
+ static void fsmc_nand_remove(struct platform_device *pdev)
  {
        struct fsmc_nand_data *host = platform_get_drvdata(pdev);
  
                }
                clk_disable_unprepare(host->clk);
        }
-       return 0;
  }
  
  #ifdef CONFIG_PM_SLEEP
@@@ -1224,7 -1222,7 +1222,7 @@@ static const struct of_device_id fsmc_n
  MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);
  
  static struct platform_driver fsmc_nand_driver = {
-       .remove = fsmc_nand_remove,
+       .remove_new = fsmc_nand_remove,
        .driver = {
                .name = "fsmc-nand",
                .of_match_table = fsmc_nand_id_table,