diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 12:29:56 +0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 12:29:56 +0400 |
| commit | 3ed628a8122112ee796cd643e2478c4a6def234c (patch) | |
| tree | 1e5e352eb501a2afa173989415a8b4896d4999a5 /arch/arm/mach-imx | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | da4a686a2cfb077a8bfc1697f597e7f86235b822 (diff) | |
| download | linux-3ed628a8122112ee796cd643e2478c4a6def234c.tar.xz | |
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx6q.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index 9ffd103b27e4..b59ddcb57c78 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/clkdev.h> +#include <linux/clocksource.h> #include <linux/cpu.h> #include <linux/delay.h> #include <linux/export.h> @@ -28,11 +29,9 @@ #include <linux/regmap.h> #include <linux/micrel_phy.h> #include <linux/mfd/syscon.h> -#include <asm/smp_twd.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/time.h> #include <asm/system_misc.h> #include "common.h" @@ -292,7 +291,7 @@ static void __init imx6q_init_irq(void) static void __init imx6q_timer_init(void) { mx6q_clocks_init(); - twd_local_timer_of_register(); + clocksource_of_init(); imx_print_silicon_rev("i.MX6Q", imx6q_revision()); } |