Commit cd24f8c1e7e27a2c6051a9a338d4704a2431dbf0
Committed by
Linus Torvalds
Linus Torvalds
1 parent
be94a4ba09
Exists in
master
and in
20 other branches
mtd: davinci nand: update clock naming
DaVinci clock support has been updated in mainline. Update clock names accordingly. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 4 additions and 3 deletions Side-by-side Diff
drivers/mtd/nand/davinci_nand.c
| ... | ... | @@ -407,16 +407,17 @@ |
| 407 | 407 | } |
| 408 | 408 | info->chip.ecc.mode = ecc_mode; |
| 409 | 409 | |
| 410 | - info->clk = clk_get(&pdev->dev, "AEMIFCLK"); | |
| 410 | + info->clk = clk_get(&pdev->dev, "aemif"); | |
| 411 | 411 | if (IS_ERR(info->clk)) { |
| 412 | 412 | ret = PTR_ERR(info->clk); |
| 413 | - dev_dbg(&pdev->dev, "unable to get AEMIFCLK, err %d\n", ret); | |
| 413 | + dev_dbg(&pdev->dev, "unable to get AEMIF clock, err %d\n", ret); | |
| 414 | 414 | goto err_clk; |
| 415 | 415 | } |
| 416 | 416 | |
| 417 | 417 | ret = clk_enable(info->clk); |
| 418 | 418 | if (ret < 0) { |
| 419 | - dev_dbg(&pdev->dev, "unable to enable AEMIFCLK, err %d\n", ret); | |
| 419 | + dev_dbg(&pdev->dev, "unable to enable AEMIF clock, err %d\n", | |
| 420 | + ret); | |
| 420 | 421 | goto err_clk_enable; |
| 421 | 422 | } |
| 422 | 423 |