Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kernel bump from 4.1.3-rt to 4.1.7-rt.
[kvmfornfv.git]
/
kernel
/
arch
/
mips
/
mti-malta
/
malta-time.c
diff --git
a/kernel/arch/mips/mti-malta/malta-time.c
b/kernel/arch/mips/mti-malta/malta-time.c
index
185e682
..
a7f7d9f
100644
(file)
--- a/
kernel/arch/mips/mti-malta/malta-time.c
+++ b/
kernel/arch/mips/mti-malta/malta-time.c
@@
-148,6
+148,7
@@
int get_c0_perfcount_int(void)
return mips_cpu_perf_irq;
}
return mips_cpu_perf_irq;
}
+EXPORT_SYMBOL_GPL(get_c0_perfcount_int);
unsigned int get_c0_compare_int(void)
{
unsigned int get_c0_compare_int(void)
{
@@
-165,14
+166,17
@@
unsigned int get_c0_compare_int(void)
static void __init init_rtc(void)
{
static void __init init_rtc(void)
{
- /* stop the clock whilst setting it up */
- CMOS_WRITE(RTC_SET | RTC_24H, RTC_CONTROL);
+ unsigned char freq, ctrl;
- /* 32KHz time base */
- CMOS_WRITE(RTC_REF_CLCK_32KHZ, RTC_FREQ_SELECT);
+ /* Set 32KHz time base if not already set */
+ freq = CMOS_READ(RTC_FREQ_SELECT);
+ if ((freq & RTC_DIV_CTL) != RTC_REF_CLCK_32KHZ)
+ CMOS_WRITE(RTC_REF_CLCK_32KHZ, RTC_FREQ_SELECT);
- /* start the clock */
- CMOS_WRITE(RTC_24H, RTC_CONTROL);
+ /* Ensure SET bit is clear so RTC can run */
+ ctrl = CMOS_READ(RTC_CONTROL);
+ if (ctrl & RTC_SET)
+ CMOS_WRITE(ctrl & ~RTC_SET, RTC_CONTROL);
}
void __init plat_time_init(void)
}
void __init plat_time_init(void)