diff options
-rw-r--r-- | arch/blackfin/Kconfig | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/time-ts.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index e7a781d21486..9a01d445eca8 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -648,7 +648,7 @@ config CYCLES_CLOCKSOURCE | |||
648 | writing the registers will most likely crash the kernel. | 648 | writing the registers will most likely crash the kernel. |
649 | 649 | ||
650 | config GPTMR0_CLOCKSOURCE | 650 | config GPTMR0_CLOCKSOURCE |
651 | bool "Use GPTimer0 as a clocksource (higher rating)" | 651 | bool "Use GPTimer0 as a clocksource" |
652 | select BFIN_GPTIMERS | 652 | select BFIN_GPTIMERS |
653 | depends on GENERIC_CLOCKEVENTS | 653 | depends on GENERIC_CLOCKEVENTS |
654 | depends on !TICKSOURCE_GPTMR0 | 654 | depends on !TICKSOURCE_GPTMR0 |
diff --git a/arch/blackfin/kernel/time-ts.c b/arch/blackfin/kernel/time-ts.c index 0791eba40d9f..f9715764383e 100644 --- a/arch/blackfin/kernel/time-ts.c +++ b/arch/blackfin/kernel/time-ts.c | |||
@@ -66,7 +66,7 @@ static cycle_t bfin_read_cycles(struct clocksource *cs) | |||
66 | 66 | ||
67 | static struct clocksource bfin_cs_cycles = { | 67 | static struct clocksource bfin_cs_cycles = { |
68 | .name = "bfin_cs_cycles", | 68 | .name = "bfin_cs_cycles", |
69 | .rating = 350, | 69 | .rating = 400, |
70 | .read = bfin_read_cycles, | 70 | .read = bfin_read_cycles, |
71 | .mask = CLOCKSOURCE_MASK(64), | 71 | .mask = CLOCKSOURCE_MASK(64), |
72 | .shift = 22, | 72 | .shift = 22, |
@@ -115,7 +115,7 @@ static cycle_t bfin_read_gptimer0(void) | |||
115 | 115 | ||
116 | static struct clocksource bfin_cs_gptimer0 = { | 116 | static struct clocksource bfin_cs_gptimer0 = { |
117 | .name = "bfin_cs_gptimer0", | 117 | .name = "bfin_cs_gptimer0", |
118 | .rating = 400, | 118 | .rating = 350, |
119 | .read = bfin_read_gptimer0, | 119 | .read = bfin_read_gptimer0, |
120 | .mask = CLOCKSOURCE_MASK(32), | 120 | .mask = CLOCKSOURCE_MASK(32), |
121 | .shift = 22, | 121 | .shift = 22, |