1 --- a/arch/mips/ralink/Kconfig
2 +++ b/arch/mips/ralink/Kconfig
4 select SYS_SUPPORTS_SMP
5 select SYS_SUPPORTS_MIPS_CPS
8 + select CLKSRC_MIPS_GIC
12 --- a/arch/mips/ralink/Makefile
13 +++ b/arch/mips/ralink/Makefile
15 # Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
16 # Copyright (C) 2013 John Crispin <blogic@openwrt.org>
18 -obj-y := prom.o of.o reset.o clk.o timer.o
19 +obj-y := prom.o of.o reset.o
21 +ifndef CONFIG_MIPS_GIC
22 + obj-y += clk.o timer.o
25 obj-$(CONFIG_CLKEVT_RT3352) += cevt-rt3352.o
27 obj-$(CONFIG_RALINK_ILL_ACC) += ill_acc.o
29 obj-$(CONFIG_IRQ_INTC) += irq.o
30 -obj-$(CONFIG_MIPS_GIC) += irq-gic.o
31 +obj-$(CONFIG_MIPS_GIC) += irq-gic.o timer-gic.o
33 obj-$(CONFIG_SOC_RT288X) += rt288x.o
34 obj-$(CONFIG_SOC_RT305X) += rt305x.o
35 --- a/arch/mips/ralink/irq-gic.c
36 +++ b/arch/mips/ralink/irq-gic.c
39 #include <linux/irqchip.h>
41 -#include <linux/irqchip/mips-gic.h>
43 -unsigned int get_c0_compare_int(void)
45 - return gic_get_c0_compare_int();
52 +++ b/arch/mips/ralink/timer-gic.c
54 +#include <linux/init.h>
56 +#include <linux/of.h>
57 +#include <linux/clk-provider.h>
58 +#include <linux/clocksource.h>
62 +void __init plat_time_init(void)
67 + clocksource_of_init();
69 --- a/arch/mips/ralink/mt7621.c
70 +++ b/arch/mips/ralink/mt7621.c
75 - cpu_clk = 880000000;
76 - ralink_clk_add("cpu", cpu_clk);
77 - ralink_clk_add("1e000b00.spi", 50000000);
78 - ralink_clk_add("1e000c00.uartlite", 50000000);
79 - ralink_clk_add("1e000d00.uart", 50000000);
82 void __init ralink_of_remap(void)