[RESEND PATCH] clk: socfpga: Remove socfpga_init_clocks

dinguyen at altera.com dinguyen at altera.com
Tue Dec 10 11:45:38 EST 2013


From: Dinh Nguyen <dinguyen at altera.com>

The only thing that socfpga_init_clocks was doing setting up the smp_twd clock.
Now that twd-timer's clock phandle is populated in the DTS, we can remove
this function.

Signed-off-by: Dinh Nguyen <dinguyen at altera.com>
---
 arch/arm/mach-socfpga/socfpga.c |    1 -
 drivers/clk/socfpga/clk.c       |   10 ----------
 2 files changed, 11 deletions(-)

diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c
index c43c281..d86231e 100644
--- a/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@ -102,7 +102,6 @@ static void __init socfpga_cyclone5_init(void)
 {
 	l2x0_of_init(0, ~0UL);
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-	socfpga_init_clocks();
 }
 
 static const char *altera_dt_match[] = {
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c
index d10dd4f..67ad200 100644
--- a/drivers/clk/socfpga/clk.c
+++ b/drivers/clk/socfpga/clk.c
@@ -348,13 +348,3 @@ static void __init socfpga_clkmgr_init(struct device_node *node)
 }
 CLK_OF_DECLARE(socfpga_mgr, "altr,clk-mgr", socfpga_clkmgr_init);
 
-void __init socfpga_init_clocks(void)
-{
-	struct clk *clk;
-	int ret;
-
-	clk = clk_register_fixed_factor(NULL, "smp_twd", "mpuclk", 0, 1, 4);
-	ret = clk_register_clkdev(clk, NULL, "smp_twd");
-	if (ret)
-		pr_err("smp_twd alias not registered\n");
-}
-- 
1.7.9.5





More information about the linux-arm-kernel mailing list