OSDN Git Service

clocksource: mips-gic: Combine with GIC clockevent driver
authorAndrew Bresticker <abrestic@chromium.org>
Mon, 20 Oct 2014 19:03:59 +0000 (12:03 -0700)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 24 Nov 2014 06:45:15 +0000 (07:45 +0100)
commita331ce63c85080f554e0a19fc4189a520c65267b
treebe84ac9416e957f7d601337f0f17bf327aebf80c
parentfa5635a277171021d364f6a3fab4addce8f358d2
clocksource: mips-gic: Combine with GIC clockevent driver

Combine the GIC clocksource driver with the GIC clockevent driver from
arch/mips/kernel/cevt-gic.c and remove the clockevent driver's separate
Kconfig symbol.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Bresticker <abrestic@chromium.org>
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/8132/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/Kconfig
arch/mips/include/asm/time.h
arch/mips/kernel/Makefile
arch/mips/kernel/cevt-gic.c [deleted file]
drivers/clocksource/mips-gic-timer.c
drivers/irqchip/irq-mips-gic.c