diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2014-02-13 21:35:07 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-26 13:49:07 +0100 |
| commit | a79528e9d849803457b6235ddb1a1cfd4e11c6cd (patch) | |
| tree | 1148e5f37f99bb6f4e6ab959edf09ceca9a0eed2 /arch/arm/mach-integrator/integrator_cp.c | |
| parent | 1b1ef755bd910106fef15bd55386b60e88d73e16 (diff) | |
| download | talos-obmc-linux-a79528e9d849803457b6235ddb1a1cfd4e11c6cd.tar.gz talos-obmc-linux-a79528e9d849803457b6235ddb1a1cfd4e11c6cd.zip | |
ARM: integrator: register sched_clock directly
The detour through plat-versatile/sched-clock.c is hard to migrate
to multiplatform set-up and it's very little code being duplicated
so let's just inline the sched_clock registration and cut one more
dependency to plat-versatile.
This also makes this sched_clock implementation compulsory.
Cc: Will Deacon <will.deacon@arm.com>
Cc: Jonathan Austin <jonathan.austin@arm.com>
Cc: Russell King <linux@arm.linux.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_cp.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index c97ab88897cf..a938242b0c95 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c @@ -27,6 +27,7 @@ #include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/sys_soc.h> +#include <linux/sched_clock.h> #include <asm/setup.h> #include <asm/mach-types.h> @@ -36,7 +37,6 @@ #include <asm/mach/time.h> #include <plat/clcd.h> -#include <plat/sched_clock.h> #include "hardware.h" #include "cm.h" @@ -225,11 +225,14 @@ static struct clcd_board clcd_data = { #define REFCOUNTER (__io_address(INTEGRATOR_HDR_BASE) + 0x28) +static u64 notrace intcp_read_sched_clock(void) +{ + return readl(REFCOUNTER); +} + static void __init intcp_init_early(void) { -#ifdef CONFIG_PLAT_VERSATILE_SCHED_CLOCK - versatile_sched_clock_init(REFCOUNTER, 24000000); -#endif + sched_clock_register(intcp_read_sched_clock, 32, 24000000); } static const struct of_device_id fpga_irq_of_match[] __initconst = { |
