Commit f772cdb2bd544eeb3e83a8bb42629d155c1b53fd

Authored by Ralf Baechle
1 parent d7ea335c05

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>

Showing 3 changed files with 2 additions and 8 deletions Side-by-side Diff

... ... @@ -54,7 +54,7 @@
54 54 config MIPS_ALCHEMY
55 55 bool "Alchemy processor based machines"
56 56 select 64BIT_PHYS_ADDR
57   - select CEVT_R4K_LIB
  57 + select CEVT_R4K
58 58 select CSRC_R4K
59 59 select IRQ_CPU
60 60 select SYS_HAS_CPU_MIPS32_R1
61 61  
... ... @@ -926,11 +926,7 @@
926 926 config CEVT_GT641XX
927 927 bool
928 928  
929   -config CEVT_R4K_LIB
930   - bool
931   -
932 929 config CEVT_R4K
933   - select CEVT_R4K_LIB
934 930 bool
935 931  
936 932 config CEVT_SB1250
arch/mips/include/asm/time.h
... ... @@ -50,10 +50,8 @@
50 50 /*
51 51 * Initialize the calling CPU's compare interrupt as clockevent device
52 52 */
53   -#ifdef CONFIG_CEVT_R4K_LIB
54 53 extern unsigned int __weak get_c0_compare_int(void);
55 54 extern int r4k_clockevent_init(void);
56   -#endif
57 55  
58 56 static inline int mips_clockevent_init(void)
59 57 {
arch/mips/kernel/Makefile
... ... @@ -16,7 +16,7 @@
16 16 endif
17 17  
18 18 obj-$(CONFIG_CEVT_BCM1480) += cevt-bcm1480.o
19   -obj-$(CONFIG_CEVT_R4K_LIB) += cevt-r4k.o
  19 +obj-$(CONFIG_CEVT_R4K) += cevt-r4k.o
20 20 obj-$(CONFIG_MIPS_MT_SMTC) += cevt-smtc.o
21 21 obj-$(CONFIG_CEVT_DS1287) += cevt-ds1287.o
22 22 obj-$(CONFIG_CEVT_GT641XX) += cevt-gt641xx.o