diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-06-11 17:33:12 +0200 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-07-11 17:58:45 -0700 |
commit | a613163dff04cbfcb7d66b06ef4a5f65498ee59b (patch) | |
tree | 51841b8f22c1eeb71068e2a71bb92c152e68a543 /arch/arm/mach-integrator/include | |
parent | 91b87a4795c42b97b8d18c3757eff352458ecef4 (diff) | |
download | talos-obmc-linux-a613163dff04cbfcb7d66b06ef4a5f65498ee59b.tar.gz talos-obmc-linux-a613163dff04cbfcb7d66b06ef4a5f65498ee59b.zip |
ARM: integrator: convert to common clock
This converts the Integrator platform to use common clock
and the ICST driver. Since from this point not all ARM
reference platforms use the clock, we define
CONFIG_PLAT_VERSATILE_CLOCK and select it for all platforms
except the Integrator.
Open issue: I could not use the .init_early() field of the
machine descriptor to initialize the clocks, but had to
move them to .init_irq(), so presumably .init_early() is
so early that common clock is not up, and .init_machine()
is too late since it's needed for the clockevent/clocksource
initialization. Any suggestions on how to solve this is
very welcome.
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[mturquette@linaro.org: use 'select' instead of versatile Kconfig]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/include')
-rw-r--r-- | arch/arm/mach-integrator/include/mach/clkdev.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/mach-integrator/include/mach/clkdev.h b/arch/arm/mach-integrator/include/mach/clkdev.h deleted file mode 100644 index bfe07679faec..000000000000 --- a/arch/arm/mach-integrator/include/mach/clkdev.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#include <linux/module.h> -#include <plat/clock.h> - -struct clk { - unsigned long rate; - const struct clk_ops *ops; - struct module *owner; - const struct icst_params *params; - void __iomem *vcoreg; - void *data; -}; - -static inline int __clk_get(struct clk *clk) -{ - return try_module_get(clk->owner); -} - -static inline void __clk_put(struct clk *clk) -{ - module_put(clk->owner); -} - -#endif |