diff options
author | Dinh Nguyen <dinguyen@altera.com> | 2013-12-05 12:34:48 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2014-02-18 17:08:09 -0500 |
commit | 77f1057777818c575f01d1e27d76bc73310eec6e (patch) | |
tree | 333b22869cdae8cd3cf9b1c08e7c346bbc1ff16a | |
parent | b7cec13f082fcc6e690559657d3f5493ea6eecb7 (diff) |
clk: socfpga: Remove socfpga_init_clocks
The only thing that socfpga_init_clocks was doing is setting up the smp_twd clk.
Now that twd-timer's clock phandle is populated in the DTS, we can remove
this function.
Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-socfpga/socfpga.c | 1 | ||||
-rw-r--r-- | drivers/clk/socfpga/clk.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index c43c28118092..d86231e11b34 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) | |||
102 | { | 102 | { |
103 | l2x0_of_init(0, ~0UL); | 103 | l2x0_of_init(0, ~0UL); |
104 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 104 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
105 | socfpga_init_clocks(); | ||
106 | } | 105 | } |
107 | 106 | ||
108 | static const char *altera_dt_match[] = { | 107 | static const char *altera_dt_match[] = { |
diff --git a/drivers/clk/socfpga/clk.c b/drivers/clk/socfpga/clk.c index cba21a0823b6..75b6257f61b9 100644 --- a/drivers/clk/socfpga/clk.c +++ b/drivers/clk/socfpga/clk.c | |||
@@ -347,13 +347,3 @@ static void __init socfpga_clkmgr_init(struct device_node *node) | |||
347 | } | 347 | } |
348 | CLK_OF_DECLARE(socfpga_mgr, "altr,clk-mgr", socfpga_clkmgr_init); | 348 | CLK_OF_DECLARE(socfpga_mgr, "altr,clk-mgr", socfpga_clkmgr_init); |
349 | 349 | ||
350 | void __init socfpga_init_clocks(void) | ||
351 | { | ||
352 | struct clk *clk; | ||
353 | int ret; | ||
354 | |||
355 | clk = clk_register_fixed_factor(NULL, "smp_twd", "mpuclk", 0, 1, 4); | ||
356 | ret = clk_register_clkdev(clk, NULL, "smp_twd"); | ||
357 | if (ret) | ||
358 | pr_err("smp_twd alias not registered\n"); | ||
359 | } | ||