leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MTD] [NAND] S3C2410 Fix previous nFCE suspend save patch

Browse Source 
Commit 03680b1e00 incorrectly
was assuming S3C2410_NFCONF was being used to select the
NAND chip. Fix this error by ising the sel_reg.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
Ben Dooks 2008-04-15 11:36:18 +01:00 committed by David Woodhouse
parent 67e5a28b35
commit 0916083210
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/mtd/nand/s3c2410.c
View File

@ -119,8 +119,7 @@ struct s3c2410_nand_info {
void __iomem *sel_reg; void __iomem *sel_reg;
int sel_bit; int sel_bit;
int mtd_count; int mtd_count;
unsigned long save_sel;
unsigned long save_nfconf;
enum s3c_cpu_type cpu_type; enum s3c_cpu_type cpu_type;
}; };
@ -810,15 +809,14 @@ static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pm)
struct s3c2410_nand_info *info = platform_get_drvdata(dev); struct s3c2410_nand_info *info = platform_get_drvdata(dev);
if (info) { if (info) {
info->save_nfconf = readl(info->regs + S3C2410_NFCONF); info->save_sel = readl(info->sel_reg);
/* For the moment, we must ensure nFCE is high during /* For the moment, we must ensure nFCE is high during
* the time we are suspended. This really should be * the time we are suspended. This really should be
* handled by suspending the MTDs we are using, but * handled by suspending the MTDs we are using, but
* that is currently not the case. */ * that is currently not the case. */
writel(info->save_nfconf | info->sel_bit, writel(info->save_sel | info->sel_bit, info->sel_reg);
info->regs + S3C2410_NFCONF);
if (!allow_clk_stop(info)) if (!allow_clk_stop(info))
clk_disable(info->clk); clk_disable(info->clk);
@ -830,7 +828,7 @@ static int s3c24xx_nand_suspend(struct platform_device *dev, pm_message_t pm)
static int s3c24xx_nand_resume(struct platform_device *dev) static int s3c24xx_nand_resume(struct platform_device *dev)
{ {
struct s3c2410_nand_info *info = platform_get_drvdata(dev); struct s3c2410_nand_info *info = platform_get_drvdata(dev);
unsigned long nfconf; unsigned long sel;
if (info) { if (info) {
clk_enable(info->clk); clk_enable(info->clk);
@ -838,10 +836,10 @@ static int s3c24xx_nand_resume(struct platform_device *dev)
/* Restore the state of the nFCE line. */ /* Restore the state of the nFCE line. */
nfconf = readl(info->regs + S3C2410_NFCONF); sel = readl(info->sel_reg);
nfconf &= ~info->sel_bit; sel &= ~info->sel_bit;
nfconf |= info->save_nfconf & info->sel_bit; sel |= info->save_sel & info->sel_bit;
writel(nfconf, info->regs + S3C2410_NFCONF); writel(sel, info->sel_reg);
if (allow_clk_stop(info)) if (allow_clk_stop(info))
clk_disable(info->clk); clk_disable(info->clk);