diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 16:53:55 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 16:53:55 +1100 |
| commit | e9a371100dfdfa4c9f994059d19d98c9b4fd80af (patch) | |
| tree | 11e9d240d87834f9da927aaa4027e7dfcbd01eb8 /drivers/mtd | |
| parent | d891ea23d5203e5c47439b2a174f86a00b356a6c (diff) | |
| parent | bc75059422338197ce487d338ac9c898761e1e61 (diff) | |
| download | linux-e9a371100dfdfa4c9f994059d19d98c9b4fd80af.tar.bz2 | |
Merge remote-tracking branch 'agust/next' into next
<<
Switch mpc512x to the common clock framework and adapt mpc512x
drivers to use the new clock driver. Old PPC_CLOCK code is
removed entirely since there are no users any more.
>>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/mpc5121_nfc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index 439bc3896418..779e60d12f89 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -731,7 +731,7 @@ static int mpc5121_nfc_probe(struct platform_device *op) of_node_put(rootnode); /* Enable NFC clock */ - clk = devm_clk_get(dev, "nfc_clk"); + clk = devm_clk_get(dev, "ipg"); if (IS_ERR(clk)) { dev_err(dev, "Unable to acquire NFC clock!\n"); retval = PTR_ERR(clk); |