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@xxxxxxxxxxxxxx>
---
drivers/clk/socfpga.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/drivers/clk/socfpga.c b/drivers/clk/socfpga.c
index be97d13fa68b..3387c0e63451 100644
--- a/drivers/clk/socfpga.c
+++ b/drivers/clk/socfpga.c
@@ -49,15 +49,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;
@@ -338,9 +329,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);
--
2.4.6
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
