aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/Kconfig
diff options
context:
space:
mode:
authorAndrew Bresticker <abrestic@chromium.org>2014-10-20 15:03:59 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-11-24 01:45:15 -0500
commita331ce63c85080f554e0a19fc4189a520c65267b (patch)
treebe84ac9416e957f7d601337f0f17bf327aebf80c /arch/mips/Kconfig
parentfa5635a277171021d364f6a3fab4addce8f358d2 (diff)
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>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r--arch/mips/Kconfig13
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 5b690cf0fec7..97bbb3b09d4b 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -935,10 +935,6 @@ config CEVT_GT641XX
935config CEVT_R4K 935config CEVT_R4K
936 bool 936 bool
937 937
938config CEVT_GIC
939 select MIPS_CM
940 bool
941
942config CEVT_SB1250 938config CEVT_SB1250
943 bool 939 bool
944 940
@@ -1911,15 +1907,6 @@ config FORCE_MAX_ZONEORDER
1911 The page size is not necessarily 4KB. Keep this in mind 1907 The page size is not necessarily 4KB. Keep this in mind
1912 when choosing a value for this option. 1908 when choosing a value for this option.
1913 1909
1914config CEVT_GIC
1915 bool "Use GIC global counter for clock events"
1916 depends on MIPS_GIC && !MIPS_SEAD3
1917 help
1918 Use the GIC global counter for the clock events. The R4K clock
1919 event driver is always present, so if the platform ends up not
1920 detecting a GIC, it will fall back to the R4K timer for the
1921 generation of clock events.
1922
1923config BOARD_SCACHE 1910config BOARD_SCACHE
1924 bool 1911 bool
1925 1912