diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-08-06 20:32:08 +0400 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2012-08-25 04:42:10 +0400 |
commit | f9a6aa4303bd15bbdb24d9fe374e4e6850298460 (patch) | |
tree | ed001ee708df4131ccbefd4f7a98756ce860aa5d /arch/arm/mach-realview/include/mach | |
parent | bc0e489eb07f4aa2fb5cb9b7ff1fdf4b6ba3bda5 (diff) | |
download | linux-f9a6aa4303bd15bbdb24d9fe374e4e6850298460.tar.xz |
clk: convert ARM RealView to common clk
This converts the ARM RealView machine over to using the common
clock. The approach is similar to the one used for the Integrator,
and we're reusing the ICST wrapper code.
We have to put the clock intialization in the timer init function
for the clocks to be available when initializing the timer,
keeping them in early_init() is too early for the common clk.
Since we now have to go down and compile drivers/clk/versatile
a CONFIG_COMMON_CLK_VERSATILE symbol has been added so the proper
code gets compiled into the kernel for either machine. A leftover
CLK_VERSATILE in the Integrator Kconfig was fixed up to use
the new symbol as well.
Tested on ARM RealView PB1176.
Cc: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-realview/include/mach')
-rw-r--r-- | arch/arm/mach-realview/include/mach/clkdev.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-realview/include/mach/clkdev.h b/arch/arm/mach-realview/include/mach/clkdev.h deleted file mode 100644 index e58d0771b64e..000000000000 --- a/arch/arm/mach-realview/include/mach/clkdev.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __ASM_MACH_CLKDEV_H -#define __ASM_MACH_CLKDEV_H - -#include <plat/clock.h> - -struct clk { - unsigned long rate; - const struct clk_ops *ops; - const struct icst_params *params; - void __iomem *vcoreg; -}; - -#define __clk_get(clk) ({ 1; }) -#define __clk_put(clk) do { } while (0) - -#endif |