diff options
| author | Prashant Gaikwad <pgaikwad@nvidia.com> | 2013-01-04 12:30:54 +0530 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2013-01-24 11:12:23 -0800 |
| commit | 85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76 (patch) | |
| tree | 3ad1e7c5fc7024134b2c02620cac1720dba7f58e /drivers | |
| parent | f2f6c2556dcc432e50003bc8fa4d62d95906f149 (diff) | |
| download | linux-85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76.tar.gz linux-85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76.tar.bz2 linux-85a181986c9cf8bbd2c4f2fb6f2add7ac5db1f76.zip | |
clk: sunxi: Use common of_clk_init() function
Use common of_clk_init() function to initialize clocks.
Signed-off-by: Prashant Gaikwad <pgaikwad@nvidia.com>
Acked-by: Maxime Ripard <maxime.ripard@anandra.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/clk-sunxi.c | 30 | ||||
| -rw-r--r-- | drivers/clocksource/sunxi_timer.c | 4 |
2 files changed, 2 insertions, 32 deletions
diff --git a/drivers/clk/clk-sunxi.c b/drivers/clk/clk-sunxi.c deleted file mode 100644 index 0e831b584ba7..000000000000 --- a/drivers/clk/clk-sunxi.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2012 Maxime Ripard - * - * Maxime Ripard <maxime.ripard@free-electrons.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include <linux/clk-provider.h> -#include <linux/clkdev.h> -#include <linux/clk/sunxi.h> -#include <linux/of.h> - -static const __initconst struct of_device_id clk_match[] = { - { .compatible = "fixed-clock", .data = of_fixed_clk_setup, }, - {} -}; - -void __init sunxi_init_clocks(void) -{ - of_clk_init(clk_match); -} diff --git a/drivers/clocksource/sunxi_timer.c b/drivers/clocksource/sunxi_timer.c index 3cd1bd3d7aee..93d09d0e009f 100644 --- a/drivers/clocksource/sunxi_timer.c +++ b/drivers/clocksource/sunxi_timer.c @@ -23,7 +23,7 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/sunxi_timer.h> -#include <linux/clk/sunxi.h> +#include <linux/clk-provider.h> #define TIMER_CTL_REG 0x00 #define TIMER_CTL_ENABLE (1 << 0) @@ -124,7 +124,7 @@ static void __init sunxi_timer_init(void) if (irq <= 0) panic("Can't parse IRQ"); - sunxi_init_clocks(); + of_clk_init(NULL); clk = of_clk_get(node, 0); if (IS_ERR(clk)) |