path: root/arch/mips
diff options
authorRalf Baechle <ralf@linux-mips.org>2012-11-30 17:27:27 +0100
committerRalf Baechle <ralf@linux-mips.org>2012-12-13 18:15:24 +0100
commitf772cdb2bd544eeb3e83a8bb42629d155c1b53fd (patch)
treebb368b90fd756fa08476fecb1efa3dea2f09f41f /arch/mips
parentd7ea335c05ba7c013615d1e0d5a71459eb4195e8 (diff)
MIPS: Remove usage of CEVT_R4K_LIB config option.
Manuel Lauss <manuel.lauss@gmail.com> writes: I introduced it as a fallback because early revisions of Alchemy hardware we shipped had a non-functional 32kHz timer and had to rely on the r4k timer instead. Previously the r4k timer was initialized regardless, but it's useless with the "wait" instruction. So long story short: I need either the on-chip 32kHz timer OR the r4k timer if the 32kHz one is unusable, but not both, and r4k timer is useless when au1k_idle is in use. The current in-kernel Alchemy boards all work with the 32kHz timer, so I'm not against removing R4K_LIB symbols. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
3 files changed, 2 insertions, 8 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b04b4916aa3..53470f0437c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -54,7 +54,7 @@ choice
bool "Alchemy processor based machines"
select 64BIT_PHYS_ADDR
- select CEVT_R4K_LIB
+ select CEVT_R4K
select CSRC_R4K
select IRQ_CPU
select SYS_HAS_CPU_MIPS32_R1
@@ -926,11 +926,7 @@ config CEVT_DS1287
config CEVT_GT641XX
-config CEVT_R4K_LIB
- bool
config CEVT_R4K
- select CEVT_R4K_LIB
config CEVT_SB1250
diff --git a/arch/mips/include/asm/time.h b/arch/mips/include/asm/time.h
index 6be93a468ec..761f2e92119 100644
--- a/arch/mips/include/asm/time.h
+++ b/arch/mips/include/asm/time.h
@@ -50,10 +50,8 @@ extern int (*perf_irq)(void);
* Initialize the calling CPU's compare interrupt as clockevent device
extern unsigned int __weak get_c0_compare_int(void);
extern int r4k_clockevent_init(void);
static inline int mips_clockevent_init(void)
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index d9abe17b355..540dff8c721 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -16,7 +16,7 @@ CFLAGS_REMOVE_perf_event_mipsxx.o = -pg
obj-$(CONFIG_CEVT_BCM1480) += cevt-bcm1480.o
-obj-$(CONFIG_CEVT_R4K_LIB) += cevt-r4k.o
+obj-$(CONFIG_CEVT_R4K) += cevt-r4k.o
obj-$(CONFIG_MIPS_MT_SMTC) += cevt-smtc.o
obj-$(CONFIG_CEVT_DS1287) += cevt-ds1287.o
obj-$(CONFIG_CEVT_GT641XX) += cevt-gt641xx.o