Commit fa5635a2 authored by Andrew Bresticker's avatar Andrew Bresticker Committed by Ralf Baechle

MIPS: Move GIC clocksource driver to drivers/clocksource/

Move the GIC clocksource driver to drivers/clocksource/mips-gic-timer.c.
Signed-off-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Paul Burton <paul.burton@imgtec.com>
Cc: Qais Yousef <qais.yousef@imgtec.com>
Cc: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8133/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 53a7bc81
...@@ -342,7 +342,7 @@ config MIPS_MALTA ...@@ -342,7 +342,7 @@ config MIPS_MALTA
select BOOT_RAW select BOOT_RAW
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select CSRC_GIC select CLKSRC_MIPS_GIC
select DMA_MAYBE_COHERENT select DMA_MAYBE_COHERENT
select GENERIC_ISA_DMA select GENERIC_ISA_DMA
select HAVE_PCSPKR_PLATFORM select HAVE_PCSPKR_PLATFORM
...@@ -385,7 +385,7 @@ config MIPS_SEAD3 ...@@ -385,7 +385,7 @@ config MIPS_SEAD3
select BUILTIN_DTB select BUILTIN_DTB
select CEVT_R4K select CEVT_R4K
select CSRC_R4K select CSRC_R4K
select CSRC_GIC select CLKSRC_MIPS_GIC
select CPU_MIPSR2_IRQ_VI select CPU_MIPSR2_IRQ_VI
select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_EI
select DMA_NONCOHERENT select DMA_NONCOHERENT
...@@ -954,10 +954,6 @@ config CSRC_IOASIC ...@@ -954,10 +954,6 @@ config CSRC_IOASIC
config CSRC_R4K config CSRC_R4K
bool bool
config CSRC_GIC
select MIPS_CM
bool
config CSRC_SB1250 config CSRC_SB1250
bool bool
......
...@@ -24,7 +24,6 @@ obj-$(CONFIG_CEVT_GT641XX) += cevt-gt641xx.o ...@@ -24,7 +24,6 @@ obj-$(CONFIG_CEVT_GT641XX) += cevt-gt641xx.o
obj-$(CONFIG_CEVT_SB1250) += cevt-sb1250.o obj-$(CONFIG_CEVT_SB1250) += cevt-sb1250.o
obj-$(CONFIG_CEVT_TXX9) += cevt-txx9.o obj-$(CONFIG_CEVT_TXX9) += cevt-txx9.o
obj-$(CONFIG_CSRC_BCM1480) += csrc-bcm1480.o obj-$(CONFIG_CSRC_BCM1480) += csrc-bcm1480.o
obj-$(CONFIG_CSRC_GIC) += csrc-gic.o
obj-$(CONFIG_CSRC_IOASIC) += csrc-ioasic.o obj-$(CONFIG_CSRC_IOASIC) += csrc-ioasic.o
obj-$(CONFIG_CSRC_R4K) += csrc-r4k.o obj-$(CONFIG_CSRC_R4K) += csrc-r4k.o
obj-$(CONFIG_CSRC_SB1250) += csrc-sb1250.o obj-$(CONFIG_CSRC_SB1250) += csrc-sb1250.o
......
...@@ -183,7 +183,7 @@ void __init plat_time_init(void) ...@@ -183,7 +183,7 @@ void __init plat_time_init(void)
freq = freqround(gic_frequency, 5000); freq = freqround(gic_frequency, 5000);
printk("GIC frequency %d.%02d MHz\n", freq/1000000, printk("GIC frequency %d.%02d MHz\n", freq/1000000,
(freq%1000000)*100/1000000); (freq%1000000)*100/1000000);
#ifdef CONFIG_CSRC_GIC #ifdef CONFIG_CLKSRC_MIPS_GIC
gic_clocksource_init(gic_frequency); gic_clocksource_init(gic_frequency);
#endif #endif
} }
......
...@@ -223,4 +223,8 @@ config CLKSRC_VERSATILE ...@@ -223,4 +223,8 @@ config CLKSRC_VERSATILE
ARM Versatile, RealView and Versatile Express reference ARM Versatile, RealView and Versatile Express reference
platforms. platforms.
config CLKSRC_MIPS_GIC
bool
depends on MIPS_GIC
endmenu endmenu
...@@ -46,3 +46,4 @@ obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o ...@@ -46,3 +46,4 @@ obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o
obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST) += dummy_timer.o obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST) += dummy_timer.o
obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o
obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o obj-$(CONFIG_CLKSRC_VERSATILE) += versatile.o
obj-$(CONFIG_CLKSRC_MIPS_GIC) += mips-gic-timer.o
...@@ -103,7 +103,7 @@ static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe) ...@@ -103,7 +103,7 @@ static inline void gic_map_to_vpe(unsigned int intr, unsigned int vpe)
GIC_SH_MAP_TO_VPE_REG_BIT(vpe)); GIC_SH_MAP_TO_VPE_REG_BIT(vpe));
} }
#if defined(CONFIG_CSRC_GIC) || defined(CONFIG_CEVT_GIC) #if defined(CONFIG_CLKSRC_MIPS_GIC) || defined(CONFIG_CEVT_GIC)
cycle_t gic_read_count(void) cycle_t gic_read_count(void)
{ {
unsigned int hi, hi2, lo; unsigned int hi, hi2, lo;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment