Commit d7ea335c05ba7c013615d1e0d5a71459eb4195e8
Committed by
Ralf Baechle
1 parent
dcb96a4e36
Exists in
master
and in
20 other branches
MIPS: Remove usage of CSRC_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: Steven J. Hill <sjhill@mips.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Showing 3 changed files with 3 additions and 7 deletions Side-by-side Diff
arch/mips/Kconfig
... | ... | @@ -55,7 +55,7 @@ |
55 | 55 | bool "Alchemy processor based machines" |
56 | 56 | select 64BIT_PHYS_ADDR |
57 | 57 | select CEVT_R4K_LIB |
58 | - select CSRC_R4K_LIB | |
58 | + select CSRC_R4K | |
59 | 59 | select IRQ_CPU |
60 | 60 | select SYS_HAS_CPU_MIPS32_R1 |
61 | 61 | select SYS_SUPPORTS_32BIT_KERNEL |
62 | 62 | |
... | ... | @@ -948,11 +948,7 @@ |
948 | 948 | config CSRC_POWERTV |
949 | 949 | bool |
950 | 950 | |
951 | -config CSRC_R4K_LIB | |
952 | - bool | |
953 | - | |
954 | 951 | config CSRC_R4K |
955 | - select CSRC_R4K_LIB | |
956 | 952 | bool |
957 | 953 | |
958 | 954 | config CSRC_SB1250 |
arch/mips/include/asm/time.h
arch/mips/kernel/Makefile
... | ... | @@ -25,7 +25,7 @@ |
25 | 25 | obj-$(CONFIG_CSRC_BCM1480) += csrc-bcm1480.o |
26 | 26 | obj-$(CONFIG_CSRC_IOASIC) += csrc-ioasic.o |
27 | 27 | obj-$(CONFIG_CSRC_POWERTV) += csrc-powertv.o |
28 | -obj-$(CONFIG_CSRC_R4K_LIB) += csrc-r4k.o | |
28 | +obj-$(CONFIG_CSRC_R4K) += csrc-r4k.o | |
29 | 29 | obj-$(CONFIG_CSRC_SB1250) += csrc-sb1250.o |
30 | 30 | obj-$(CONFIG_SYNC_R4K) += sync-r4k.o |
31 | 31 |