[PATCH v3 26/31] [media] fsl-viu: remove now obsolete clock lookup name
From: Gerhard Sittig <hidden>
Date: 2013-07-22 12:14:53
Also in:
linux-arm-kernel, linuxppc-dev
Subsystem:
linux for powerpc (32-bit and 64-bit), linux for powerpc embedded mpc5xxx, media input infrastructure (v4l/dvb), the rest · Maintainers:
Madhavan Srinivasan, Michael Ellerman, Anatolij Gustschin, Mauro Carvalho Chehab, Linus Torvalds
after device tree based clock lookup became available, the VIU driver need no longer use the previous "viu_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 <redacted> --- arch/powerpc/platforms/512x/clock-commonclk.c | 1 - drivers/media/platform/fsl-viu.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 24e1706..f047d4c 100644
--- a/arch/powerpc/platforms/512x/clock-commonclk.c
+++ b/arch/powerpc/platforms/512x/clock-commonclk.c@@ -676,7 +676,6 @@ static void mpc512x_clk_setup_clock_tree(int busfreq) /* clkdev registration for compatibility reasons */ 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); pr_debug("clock tree setup complete\n"); freq = clk_get_rate(clks[MPC512x_CLK_E300]);
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index 48fced4..8a17433 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c@@ -1578,7 +1578,7 @@ static int viu_of_probe(struct platform_device *op) } /* enable VIU clock */ - clk = devm_clk_get(&op->dev, "viu_clk"); + clk = devm_clk_get(&op->dev, "per"); if (IS_ERR(clk)) { dev_err(&op->dev, "failed to lookup the clock!\n"); ret = PTR_ERR(clk);
--
1.7.10.4