after device tree based clock lookup became available, the NAND flash driver need no longer use the previous "nfc_clk" name but can switch to the fixed "per" clock name -- adjust the peripheral driver and remove the clock driver's clkdev registration Signed-off-by: Gerhard Sittig <gsi@xxxxxxx> --- arch/powerpc/platforms/512x/clock-commonclk.c | 1 - drivers/mtd/nand/mpc5121_nfc.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/512x/clock-commonclk.c b/arch/powerpc/platforms/512x/clock-commonclk.c index 4615fad..0e23b45 100644 --- a/arch/powerpc/platforms/512x/clock-commonclk.c +++ b/arch/powerpc/platforms/512x/clock-commonclk.c @@ -657,7 +657,6 @@ static void mpc512x_clk_setup_clock_tree(int busfreq) clk_register_clkdev(clks[MPC512x_CLK_REF], "ref_clk", NULL); clk_register_clkdev(clks[MPC512x_CLK_SYS], "sys_clk", NULL); clk_register_clkdev(clks[MPC512x_CLK_VIU], "viu_clk", NULL); - clk_register_clkdev(clks[MPC512x_CLK_NFC], "nfc_clk", NULL); /* enable some of the clocks here unconditionally because ... */ pr_debug("automatically enabling some clocks\n"); diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index 3c60a00..e541ec0 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -729,7 +729,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, "per"); if (IS_ERR(clk)) { dev_err(dev, "Unable to acquire NFC clock!\n"); retval = PTR_ERR(clk); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html