diff options
author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2013-01-04 02:00:56 -0500 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-01-24 14:12:52 -0500 |
commit | 5b6e0adb69674c684c33503f50010644b049029c (patch) | |
tree | 170d9376c54b0704289502de2c9b06777752bd75 /drivers/clk | |
parent | d34bcdeb43331f87acf21423df26a8567c07de67 (diff) |
clk: vt8500: Use common of_clk_init() function
Use common of_clk_init() function for clock initialization.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Tested-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: added entry for wm8750-pll-clock]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/clk-vt8500.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/clk/clk-vt8500.c b/drivers/clk/clk-vt8500.c index 2515d4f31758..b5538bba7a10 100644 --- a/drivers/clk/clk-vt8500.c +++ b/drivers/clk/clk-vt8500.c | |||
@@ -291,7 +291,7 @@ static __init void vtwm_device_clk_init(struct device_node *node) | |||
291 | rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); | 291 | rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); |
292 | clk_register_clkdev(clk, clk_name, NULL); | 292 | clk_register_clkdev(clk, clk_name, NULL); |
293 | } | 293 | } |
294 | 294 | CLK_OF_DECLARE(vt8500_device, "via,vt8500-device-clock", vtwm_device_clk_init); | |
295 | 295 | ||
296 | /* PLL clock related functions */ | 296 | /* PLL clock related functions */ |
297 | 297 | ||
@@ -612,26 +612,19 @@ static void __init vt8500_pll_init(struct device_node *node) | |||
612 | { | 612 | { |
613 | vtwm_pll_clk_init(node, PLL_TYPE_VT8500); | 613 | vtwm_pll_clk_init(node, PLL_TYPE_VT8500); |
614 | } | 614 | } |
615 | CLK_OF_DECLARE(vt8500_pll, "via,vt8500-pll-clock", vt8500_pll_init); | ||
615 | 616 | ||
616 | static void __init wm8650_pll_init(struct device_node *node) | 617 | static void __init wm8650_pll_init(struct device_node *node) |
617 | { | 618 | { |
618 | vtwm_pll_clk_init(node, PLL_TYPE_WM8650); | 619 | vtwm_pll_clk_init(node, PLL_TYPE_WM8650); |
619 | } | 620 | } |
621 | CLK_OF_DECLARE(wm8650_pll, "wm,wm8650-pll-clock", wm8650_pll_init); | ||
620 | 622 | ||
621 | static void __init wm8750_pll_init(struct device_node *node) | 623 | static void __init wm8750_pll_init(struct device_node *node) |
622 | { | 624 | { |
623 | vtwm_pll_clk_init(node, PLL_TYPE_WM8750); | 625 | vtwm_pll_clk_init(node, PLL_TYPE_WM8750); |
624 | } | 626 | } |
625 | 627 | CLK_OF_DECLARE(wm8750_pll, "wm,wm8750-pll-clock", wm8750_pll_init); | |
626 | static const __initconst struct of_device_id clk_match[] = { | ||
627 | { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, | ||
628 | { .compatible = "via,vt8500-pll-clock", .data = vt8500_pll_init, }, | ||
629 | { .compatible = "wm,wm8650-pll-clock", .data = wm8650_pll_init, }, | ||
630 | { .compatible = "wm,wm8750-pll-clock", .data = wm8750_pll_init, }, | ||
631 | { .compatible = "via,vt8500-device-clock", | ||
632 | .data = vtwm_device_clk_init, }, | ||
633 | { /* sentinel */ } | ||
634 | }; | ||
635 | 628 | ||
636 | void __init vtwm_clk_init(void __iomem *base) | 629 | void __init vtwm_clk_init(void __iomem *base) |
637 | { | 630 | { |
@@ -640,5 +633,5 @@ void __init vtwm_clk_init(void __iomem *base) | |||
640 | 633 | ||
641 | pmc_base = base; | 634 | pmc_base = base; |
642 | 635 | ||
643 | of_clk_init(clk_match); | 636 | of_clk_init(NULL); |
644 | } | 637 | } |