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

Commit 8541c118 authored by Vladimir Barinov's avatar Vladimir Barinov Committed by David Woodhouse
Browse files

mtd: MXC NAND driver fixes (v5) 



The following patch fixes:
 - re-initialization of host->col_addr which is used as byte index
   between the successive READID flash commands.
 - compile error when CONFIG_PM is enabled
 - pass on the error code from clk_get()
 - return -ENOMEM in case of failed ioremap()
 - pass on the return value of platform_driver_probe() directly
 - remove excessive printk
 - let command line partition table parsing with mxc_nand name.
   The cmd_line parsing is done via <mtd-id> name that differs
   from mxc_nand by default and looks like "NAND 256MiB 1,8V 8-bit"

Signed-off-by: default avatarVladimir Barinov <vbarinov@embeddedalley.com>
Signed-off-by: default avatarLothar Wassmann <LW@KARO-electronics.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent b5c42bc8

drivers/mtd/nand/mxc_nand.c

+23 −20
Original line number Diff line number Diff line
@@ -831,6 +831,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command, 
		break;



	case NAND_CMD_READID:

		host->col_addr = 0;

		send_read_id(host);

		break;
@@ -867,6 +868,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) 
	mtd->priv = this;

	mtd->owner = THIS_MODULE;

	mtd->dev.parent = &pdev->dev;

	mtd->name = "mxc_nand";



	/* 50 us command delay time */

	this->chip_delay = 5;
@@ -882,8 +884,10 @@ static int __init mxcnd_probe(struct platform_device *pdev) 
	this->verify_buf = mxc_nand_verify_buf;



	host->clk = clk_get(&pdev->dev, "nfc");

	if (IS_ERR(host->clk))

	if (IS_ERR(host->clk)) {

		err = PTR_ERR(host->clk);

		goto eclk;

	}



	clk_enable(host->clk);

	host->clk_act = 1;
@@ -896,7 +900,7 @@ static int __init mxcnd_probe(struct platform_device *pdev) 


	host->regs = ioremap(res->start, res->end - res->start + 1);

	if (!host->regs) {

		err = -EIO;

		err = -ENOMEM;

		goto eres;

	}
@@ -1011,30 +1015,35 @@ static int __devexit mxcnd_remove(struct platform_device *pdev) 
#ifdef CONFIG_PM

static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state)

{

	struct mtd_info *info = platform_get_drvdata(pdev);

	struct mtd_info *mtd = platform_get_drvdata(pdev);

	struct nand_chip *nand_chip = mtd->priv;

	struct mxc_nand_host *host = nand_chip->priv;

	int ret = 0;



	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");

	if (info)

		ret = info->suspend(info);



	if (mtd) {

		ret = mtd->suspend(mtd);

		/* Disable the NFC clock */

	clk_disable(nfc_clk);	/* FIXME */

		clk_disable(host->clk);

	}



	return ret;

}



static int mxcnd_resume(struct platform_device *pdev)

{

	struct mtd_info *info = platform_get_drvdata(pdev);

	struct mtd_info *mtd = platform_get_drvdata(pdev);

	struct nand_chip *nand_chip = mtd->priv;

	struct mxc_nand_host *host = nand_chip->priv;

	int ret = 0;



	DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");

	/* Enable the NFC clock */

	clk_enable(nfc_clk);	/* FIXME */



	if (info)

		info->resume(info);

	if (mtd) {

		/* Enable the NFC clock */

		clk_enable(host->clk);

		mtd->resume(mtd);

	}



	return ret;

}
@@ -1055,13 +1064,7 @@ static struct platform_driver mxcnd_driver = { 


static int __init mxc_nd_init(void)

{

	/* Register the device driver structure. */

	pr_info("MXC MTD nand Driver\n");

	if (platform_driver_probe(&mxcnd_driver, mxcnd_probe) != 0) {

		printk(KERN_ERR "Driver register failed for mxcnd_driver\n");

		return -ENODEV;

	}

	return 0;

	return platform_driver_probe(&mxcnd_driver, mxcnd_probe);

}



static void __exit mxc_nd_cleanup(void)