Sfoglia il codice sorgente

ARM: 7945/1: footbridge: Switch to sched_clock_register()

The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
Upgrade to the 64 bit function to allow us to remove the 32 bit
registration interface.

Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Stephen Boyd 11 anni fa
parent
commit
889f172d92
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      arch/arm/mach-footbridge/dc21285-timer.c

+ 2 - 2
arch/arm/mach-footbridge/dc21285-timer.c

@@ -125,7 +125,7 @@ void __init footbridge_timer_init(void)
 	clockevents_config_and_register(ce, rate, 0x4, 0xffffff);
 	clockevents_config_and_register(ce, rate, 0x4, 0xffffff);
 }
 }
 
 
-static u32 notrace footbridge_read_sched_clock(void)
+static u64 notrace footbridge_read_sched_clock(void)
 {
 {
 	return ~*CSR_TIMER3_VALUE;
 	return ~*CSR_TIMER3_VALUE;
 }
 }
@@ -138,5 +138,5 @@ void __init footbridge_sched_clock(void)
 	*CSR_TIMER3_CLR = 0;
 	*CSR_TIMER3_CLR = 0;
 	*CSR_TIMER3_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_DIV16;
 	*CSR_TIMER3_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_DIV16;
 
 
-	setup_sched_clock(footbridge_read_sched_clock, 24, rate);
+	sched_clock_register(footbridge_read_sched_clock, 24, rate);
 }
 }