diff options
author | Steffen Trumtrar <s.trumtrar@pengutronix.de> | 2015-08-10 14:07:33 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-08-19 16:06:29 +0200 |
commit | 6d5996d88db91b7167289ee7a01a574670eba51e (patch) | |
tree | 7a826c871a05669c4fa04805c2abc074c87dd53e | |
parent | 8891da214308c65baf4fdc25718b1ef7eefcdfc4 (diff) | |
download | barebox-6d5996d88db91b7167289ee7a01a574670eba51e.tar.gz barebox-6d5996d88db91b7167289ee7a01a574670eba51e.tar.xz |
clk: socfpga: don't register fixed clocks
The fixed clocks are registered from devicetree. Therefore the code path is
not needed, but would instead register the clocks twice, which leads to the
error message:
clk_register clk f2s_periph_ref_clk is already registered, skipping!
of_clk_init: failed to init clock for /soc/clkmgr@ffd04000/clocks/f2s_periph_ref_clk: 1
clk_register clk osc1 is already registered, skipping!
of_clk_init: failed to init clock for /soc/clkmgr@ffd04000/clocks/osc1: 1
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | drivers/clk/socfpga.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/clk/socfpga.c b/drivers/clk/socfpga.c index 38950c3401..5952efb336 100644 --- a/drivers/clk/socfpga.c +++ b/drivers/clk/socfpga.c @@ -54,15 +54,6 @@ static void __iomem *clk_mgr_base_addr; -static struct clk *socfpga_fixed_clk(struct device_node *node) -{ - uint32_t f = 0; - - of_property_read_u32(node, "clock-frequency", &f); - - return clk_fixed(node->name, f); -} - struct clk_pll { struct clk clk; const char *parent; @@ -369,9 +360,7 @@ static void socfpga_register_clocks(struct device_d *dev, struct device_node *no socfpga_register_clocks(dev, child); } - if (of_device_is_compatible(node, "fixed-clock")) - clk = socfpga_fixed_clk(node); - else if (of_device_is_compatible(node, "altr,socfpga-pll-clock")) + if (of_device_is_compatible(node, "altr,socfpga-pll-clock")) clk = socfpga_pll_clk(node); else if (of_device_is_compatible(node, "altr,socfpga-perip-clk")) clk = socfpga_periph_clk(node); |