1 files changed, 2 insertions, 15 deletions

diff --git a/drivers/clk/mvebu/clk-cpu.c b/drivers/clk/mvebu/clk-cpu.c
index 9dd2551a0a41..b0fbc0715491 100644
--- a/drivers/clk/mvebu/clk-cpu.c
+++ b/drivers/clk/mvebu/clk-cpu.c
@@ -16,7 +16,6 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/delay.h>
-#include "clk-cpu.h"
 
 #define SYS_CTRL_CLK_DIVIDER_CTRL_OFFSET    0x0
 #define SYS_CTRL_CLK_DIVIDER_VALUE_OFFSET   0xC
@@ -173,17 +172,5 @@ clks_out:
         kfree(cpuclk);
 }
 
-static const __initconst struct of_device_id clk_cpu_match[] = {
-        {
-                .compatible = "marvell,armada-xp-cpu-clock",
-                .data = of_cpu_clk_setup,
-        },
-        {
-                /* sentinel */
-        },
-};
-
-void __init mvebu_cpu_clk_init(void)
-{
-        of_clk_init(clk_cpu_match);
-}
+CLK_OF_DECLARE(armada_xp_cpu_clock, "marvell,armada-xp-cpu-clock",
+                                         of_cpu_clk_setup);