Commit 7227aacb authored by Miquel Raynal's avatar Miquel Raynal
Browse files

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



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: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parents 38f1aa55 ec185b18

drivers/mtd/nand/ecc-mxic.c

+2 −4
Original line number Diff line number Diff line
@@ -847,13 +847,11 @@ static int mxic_ecc_probe(struct platform_device *pdev) 
	return 0;

}



static int mxic_ecc_remove(struct platform_device *pdev)

static void mxic_ecc_remove(struct platform_device *pdev)

{

	struct mxic_ecc_engine *mxic = platform_get_drvdata(pdev);



	nand_ecc_unregister_on_host_hw_engine(&mxic->external_engine);



	return 0;

}



static const struct of_device_id mxic_ecc_of_ids[] = {
@@ -870,7 +868,7 @@ static struct platform_driver mxic_ecc_driver = { 
		.of_match_table = mxic_ecc_of_ids,

	},

	.probe = mxic_ecc_probe,

	.remove	= mxic_ecc_remove,

	.remove_new = mxic_ecc_remove,

};

module_platform_driver(mxic_ecc_driver);

drivers/mtd/nand/onenand/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ config MTD_ONENAND_GENERIC 
config MTD_ONENAND_OMAP2

	tristate "OneNAND on OMAP2/OMAP3 support"

	depends on ARCH_OMAP2 || ARCH_OMAP3 || (COMPILE_TEST && ARM)

	depends on OF || COMPILE_TEST

	depends on OF

	depends on OMAP_GPMC

	help

	  Support for a OneNAND flash device connected to an OMAP2/OMAP3 SoC

drivers/mtd/nand/onenand/generic.c

+2 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int generic_onenand_probe(struct platform_device *pdev) 
	return err;

}



static int generic_onenand_remove(struct platform_device *pdev)

static void generic_onenand_remove(struct platform_device *pdev)

{

	struct onenand_info *info = platform_get_drvdata(pdev);

	struct resource *res = pdev->resource;
@@ -97,8 +97,6 @@ static int generic_onenand_remove(struct platform_device *pdev) 
		iounmap(info->onenand.base);

		kfree(info);

	}



	return 0;

}



static struct platform_driver generic_onenand_driver = {
@@ -106,7 +104,7 @@ static struct platform_driver generic_onenand_driver = { 
		.name		= DRIVER_NAME,

	},

	.probe		= generic_onenand_probe,

	.remove		= generic_onenand_remove,

	.remove_new	= generic_onenand_remove,

};



module_platform_driver(generic_onenand_driver);

drivers/mtd/nand/onenand/onenand_omap2.c

+2 −4
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ static int omap2_onenand_probe(struct platform_device *pdev) 
	return r;

}



static int omap2_onenand_remove(struct platform_device *pdev)

static void omap2_onenand_remove(struct platform_device *pdev)

{

	struct omap2_onenand *c = dev_get_drvdata(&pdev->dev);
@@ -589,8 +589,6 @@ static int omap2_onenand_remove(struct platform_device *pdev) 
	if (c->dma_chan)

		dma_release_channel(c->dma_chan);

	omap2_onenand_shutdown(pdev);



	return 0;

}



static const struct of_device_id omap2_onenand_id_table[] = {
@@ -601,7 +599,7 @@ MODULE_DEVICE_TABLE(of, omap2_onenand_id_table); 


static struct platform_driver omap2_onenand_driver = {

	.probe		= omap2_onenand_probe,

	.remove		= omap2_onenand_remove,

	.remove_new	= omap2_onenand_remove,

	.shutdown	= omap2_onenand_shutdown,

	.driver		= {

		.name	= DRIVER_NAME,

drivers/mtd/nand/onenand/onenand_samsung.c

+2 −4
Original line number Diff line number Diff line
@@ -943,13 +943,11 @@ static int s3c_onenand_probe(struct platform_device *pdev) 
	return 0;

}



static int s3c_onenand_remove(struct platform_device *pdev)

static void s3c_onenand_remove(struct platform_device *pdev)

{

	struct mtd_info *mtd = platform_get_drvdata(pdev);



	onenand_release(mtd);



	return 0;

}



static int s3c_pm_ops_suspend(struct device *dev)
@@ -996,7 +994,7 @@ static struct platform_driver s3c_onenand_driver = { 
	},

	.id_table	= s3c_onenand_driver_ids,

	.probe          = s3c_onenand_probe,

	.remove         = s3c_onenand_remove,

	.remove_new     = s3c_onenand_remove,

};



module_platform_driver(s3c_onenand_driver);