Merge tag 'kvm-3.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / drivers / clk / clk-zynq.c

diff --git a/drivers/clk/clk-zynq.c b/drivers/clk/clk-zynq.c
index 37a30514fd66261d2ab64fad0a5900e6d391c121..b14a25f3925514ac09ee75953fa07e4104291b5b 100644 (file)
--- a/drivers/clk/clk-zynq.c
+++ b/drivers/clk/clk-zynq.c
@@ -81,6 +81,7 @@ static void __init zynq_pll_clk_setup(struct device_node *np)
        if (WARN_ON(ret))
                return;
 }
+CLK_OF_DECLARE(zynq_pll, "xlnx,zynq-pll", zynq_pll_clk_setup);
 
 struct zynq_periph_clk {
        struct clk_hw           hw;
@@ -187,6 +188,7 @@ static void __init zynq_periph_clk_setup(struct device_node *np)
        if (WARN_ON(err))
                return;
 }
+CLK_OF_DECLARE(zynq_periph, "xlnx,zynq-periph-clock", zynq_periph_clk_setup);
 
 /* CPU Clock domain is modelled as a mux with 4 children subclks, whose
  * derivative rates depend on CLK_621_TRUE
@@ -366,18 +368,10 @@ static void __init zynq_cpu_clk_setup(struct device_node *np)
        if (WARN_ON(err))
                return;
 }
-
-static const __initconst struct of_device_id zynq_clk_match[] = {
-       { .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-       { .compatible = "xlnx,zynq-pll", .data = zynq_pll_clk_setup, },
-       { .compatible = "xlnx,zynq-periph-clock",
-               .data = zynq_periph_clk_setup, },
-       { .compatible = "xlnx,zynq-cpu-clock", .data = zynq_cpu_clk_setup, },
-       {}
-};
+CLK_OF_DECLARE(zynq_cpu, "xlnx,zynq-cpu-clock", zynq_cpu_clk_setup);
 
 void __init xilinx_zynq_clocks_init(void __iomem *slcr)
 {
        slcr_base = slcr;
-       of_clk_init(zynq_clk_match);
+       of_clk_init(NULL);
 }