diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-03 11:30:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-03 11:30:36 +0100 |
commit | 03e075b38e6cd25267c8d6e2797fa4537ca3348d (patch) | |
tree | 608ece74f1b3cca290e3408a29cf73e822f0ef4d /arch/mips/ralink/timer-gic.c | |
parent | x86/efi: Setup separate EFI page tables in kexec paths (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.tar.xz linux-03e075b38e6cd25267c8d6e2797fa4537ca3348d.zip |
Merge branch 'linus' into efi/core, to refresh the branch and to pick up recent fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/ralink/timer-gic.c')
-rw-r--r-- | arch/mips/ralink/timer-gic.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/mips/ralink/timer-gic.c b/arch/mips/ralink/timer-gic.c new file mode 100644 index 000000000000..5b4f186bcf95 --- /dev/null +++ b/arch/mips/ralink/timer-gic.c @@ -0,0 +1,24 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + * + * Copyright (C) 2015 Nikolay Martynov <mar.kolya@gmail.com> + * Copyright (C) 2015 John Crispin <blogic@openwrt.org> + */ + +#include <linux/init.h> + +#include <linux/of.h> +#include <linux/clk-provider.h> +#include <linux/clocksource.h> + +#include "common.h" + +void __init plat_time_init(void) +{ + ralink_of_remap(); + + of_clk_init(NULL); + clocksource_probe(); +} |