openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge git://git.infradead.org/~dwmw2/mtd-2.6.30 

* git://git.infradead.org/~dwmw2/mtd-2.6.30:
  jffs2: Fix corruption when flash erase/write failure
  mtd: MXC NAND driver fixes (v5)
This commit is contained in:
Linus Torvalds 2009-05-29 08:52:13 -07:00
parent b939e414f0 81e2962801
commit 3218911f83
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/mtd/nand/mxc_nand.c
View File

@ -831,6 +831,7 @@ static void mxc_nand_command(struct mtd_info *mtd, unsigned command,
break; break;
case NAND_CMD_READID: case NAND_CMD_READID:
host->col_addr = 0;
send_read_id(host); send_read_id(host);
break; break;
@ -867,6 +868,7 @@ static int __init mxcnd_probe(struct platform_device *pdev)
mtd->priv = this; mtd->priv = this;
mtd->owner = THIS_MODULE; mtd->owner = THIS_MODULE;
mtd->dev.parent = &pdev->dev; mtd->dev.parent = &pdev->dev;
mtd->name = "mxc_nand";
/* 50 us command delay time */ /* 50 us command delay time */
this->chip_delay = 5; this->chip_delay = 5;
@ -882,8 +884,10 @@ static int __init mxcnd_probe(struct platform_device *pdev)
this->verify_buf = mxc_nand_verify_buf; this->verify_buf = mxc_nand_verify_buf;
host->clk = clk_get(&pdev->dev, "nfc"); host->clk = clk_get(&pdev->dev, "nfc");
if (IS_ERR(host->clk)) if (IS_ERR(host->clk)) {
err = PTR_ERR(host->clk);
goto eclk; goto eclk;
}
clk_enable(host->clk); clk_enable(host->clk);
host->clk_act = 1; 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); host->regs = ioremap(res->start, res->end - res->start + 1);
if (!host->regs) { if (!host->regs) {
err = -EIO; err = -ENOMEM;
goto eres; goto eres;
} }
@ -1011,30 +1015,35 @@ static int __devexit mxcnd_remove(struct platform_device *pdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int mxcnd_suspend(struct platform_device *pdev, pm_message_t state) 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; int ret = 0;
DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n"); DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND suspend\n");
if (info) if (mtd) {
ret = info->suspend(info); ret = mtd->suspend(mtd);
/* Disable the NFC clock */
/* Disable the NFC clock */ clk_disable(host->clk);
clk_disable(nfc_clk); /* FIXME */ }
return ret; return ret;
} }
static int mxcnd_resume(struct platform_device *pdev) 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; int ret = 0;
DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n"); DEBUG(MTD_DEBUG_LEVEL0, "MXC_ND : NAND resume\n");
/* Enable the NFC clock */
clk_enable(nfc_clk); /* FIXME */
if (info) if (mtd) {
info->resume(info); /* Enable the NFC clock */
clk_enable(host->clk);
mtd->resume(mtd);
}
return ret; return ret;
} }
@ -1055,13 +1064,7 @@ static struct platform_driver mxcnd_driver = {
static int __init mxc_nd_init(void) static int __init mxc_nd_init(void)
{ {
/* Register the device driver structure. */ return platform_driver_probe(&mxcnd_driver, mxcnd_probe);
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;
} }
static void __exit mxc_nd_cleanup(void) static void __exit mxc_nd_cleanup(void)

7
fs/jffs2/erase.c
View File

@ -480,13 +480,6 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
return; return;
filebad: filebad:
mutex_lock(&c->erase_free_sem);
spin_lock(&c->erase_completion_lock);
/* Stick it on a list (any list) so erase_failed can take it
right off again. Silly, but shouldn't happen often. */
list_move(&jeb->list, &c->erasing_list);
spin_unlock(&c->erase_completion_lock);
mutex_unlock(&c->erase_free_sem);
jffs2_erase_failed(c, jeb, bad_offset); jffs2_erase_failed(c, jeb, bad_offset);
return; return;