Merge tag 'upstream-4.9-rc1' of git://git.infradead.org/linux-ubifs

[linux-beck.git] / drivers / clk / mvebu / dove.c

diff --git a/drivers/clk/mvebu/dove.c b/drivers/clk/mvebu/dove.c
index b8c2424ac9261dea5c36553b09f5262bba359299..59fad9546c847946d71bd8348dcff615f936e0e4 100644 (file)
--- a/drivers/clk/mvebu/dove.c
+++ b/drivers/clk/mvebu/dove.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include "common.h"
+#include "dove-divider.h"
 
 /*
  * Core Clocks
@@ -184,9 +185,14 @@ static void __init dove_clk_init(struct device_node *np)
 {
        struct device_node *cgnp =
                of_find_compatible_node(NULL, NULL, "marvell,dove-gating-clock");
+       struct device_node *ddnp =
+               of_find_compatible_node(NULL, NULL, "marvell,dove-divider-clock");
 
        mvebu_coreclk_setup(np, &dove_coreclks);
 
+       if (ddnp)
+               dove_divider_clk_init(ddnp);
+
        if (cgnp)
                mvebu_clk_gating_setup(cgnp, dove_gating_desc);
 }