From 0bfadf3b39f98ddf79d052ddc3c99407a0d19aab Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Fri, 5 Jun 2009 18:48:08 +0100 Subject: [PATCH] --- yaml --- r: 145504 b: refs/heads/master c: cd24f8c1e7e27a2c6051a9a338d4704a2431dbf0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/davinci_nand.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9ccc0eac1a74..d4e718db0410 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be94a4ba093c75e06b6fd2b0476f34812fbd359e +refs/heads/master: cd24f8c1e7e27a2c6051a9a338d4704a2431dbf0 diff --git a/trunk/drivers/mtd/nand/davinci_nand.c b/trunk/drivers/mtd/nand/davinci_nand.c index 0119220de7d0..02700f769b8a 100644 --- a/trunk/drivers/mtd/nand/davinci_nand.c +++ b/trunk/drivers/mtd/nand/davinci_nand.c @@ -407,16 +407,17 @@ static int __init nand_davinci_probe(struct platform_device *pdev) } info->chip.ecc.mode = ecc_mode; - info->clk = clk_get(&pdev->dev, "AEMIFCLK"); + info->clk = clk_get(&pdev->dev, "aemif"); if (IS_ERR(info->clk)) { ret = PTR_ERR(info->clk); - dev_dbg(&pdev->dev, "unable to get AEMIFCLK, err %d\n", ret); + dev_dbg(&pdev->dev, "unable to get AEMIF clock, err %d\n", ret); goto err_clk; } ret = clk_enable(info->clk); if (ret < 0) { - dev_dbg(&pdev->dev, "unable to enable AEMIFCLK, err %d\n", ret); + dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n", + ret); goto err_clk_enable; }