From: Graf Yang Date: Mon, 14 Sep 2009 04:41:00 +0000 (+0000) Subject: Blackfin: swap clocksource ratings for gptimer/cycles X-Git-Tag: v4.13~22065^2~3 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e78feaaeeb9bbf78f961917d72d692802ac110e8;p=mirror_ubuntu-bionic-kernel.git Blackfin: swap clocksource ratings for gptimer/cycles The cycles clocksource is a higher resolution than the gptimer one, so make sure the ratings field reflects this. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger --- 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 writing the registers will most likely crash the kernel. config GPTMR0_CLOCKSOURCE - bool "Use GPTimer0 as a clocksource (higher rating)" + bool "Use GPTimer0 as a clocksource" select BFIN_GPTIMERS depends on GENERIC_CLOCKEVENTS 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) static struct clocksource bfin_cs_cycles = { .name = "bfin_cs_cycles", - .rating = 350, + .rating = 400, .read = bfin_read_cycles, .mask = CLOCKSOURCE_MASK(64), .shift = 22, @@ -115,7 +115,7 @@ static cycle_t bfin_read_gptimer0(void) static struct clocksource bfin_cs_gptimer0 = { .name = "bfin_cs_gptimer0", - .rating = 400, + .rating = 350, .read = bfin_read_gptimer0, .mask = CLOCKSOURCE_MASK(32), .shift = 22,