Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf95efd4 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by David Woodhouse
Browse files

mtd: plat_nand: add platform probe/remove callbacks 



Add optional probe and remove callbacks to the plat_nand driver.

Some platforms may require additional setup, such as configuring the
memory controller, before the nand device can be accessed.  This patch
provides an optional callback to handle this setup as well as a callback
to teardown the setup.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Tested-by: default avatarAlexander Clouter <alex@digriz.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 4d964824

drivers/mtd/nand/plat_nand.c

+11 −2
Original line number Diff line number Diff line
@@ -72,6 +72,13 @@ static int __devinit plat_nand_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, data);



	/* Handle any platform specific setup */

	if (pdata->ctrl.probe) {

		res = pdata->ctrl.probe(pdev);

		if (res)

			goto out;

	}



	/* Scan to find existance of the device */

	if (nand_scan(&data->mtd, 1)) {

		res = -ENXIO;
@@ -101,6 +108,8 @@ static int __devinit plat_nand_probe(struct platform_device *pdev) 


	nand_release(&data->mtd);

out:

	if (pdata->ctrl.remove)

		pdata->ctrl.remove(pdev);

	platform_set_drvdata(pdev, NULL);

	iounmap(data->io_base);

	kfree(data);
@@ -113,15 +122,15 @@ static int __devinit plat_nand_probe(struct platform_device *pdev) 
static int __devexit plat_nand_remove(struct platform_device *pdev)

{

	struct plat_nand_data *data = platform_get_drvdata(pdev);

#ifdef CONFIG_MTD_PARTITIONS

	struct platform_nand_data *pdata = pdev->dev.platform_data;

#endif



	nand_release(&data->mtd);

#ifdef CONFIG_MTD_PARTITIONS

	if (data->parts && data->parts != pdata->chip.partitions)

		kfree(data->parts);

#endif

	if (pdata->ctrl.remove)

		pdata->ctrl.remove(pdev);

	iounmap(data->io_base);

	kfree(data);

include/linux/mtd/nand.h

+7 −0
Original line number Diff line number Diff line
@@ -577,8 +577,13 @@ struct platform_nand_chip { 
	void			*priv;

};



/* Keep gcc happy */

struct platform_device;



/**

 * struct platform_nand_ctrl - controller level device structure

 * @probe:		platform specific function to probe/setup hardware

 * @remove:		platform specific function to remove/teardown hardware

 * @hwcontrol:		platform specific hardware control structure

 * @dev_ready:		platform specific function to read ready/busy pin

 * @select_chip:	platform specific chip select function
@@ -591,6 +596,8 @@ struct platform_nand_chip { 
 * All fields are optional and depend on the hardware driver requirements

 */

struct platform_nand_ctrl {

	int		(*probe)(struct platform_device *pdev);

	void		(*remove)(struct platform_device *pdev);

	void		(*hwcontrol)(struct mtd_info *mtd, int cmd);

	int		(*dev_ready)(struct mtd_info *mtd);

	void		(*select_chip)(struct mtd_info *mtd, int chip);