Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea7113f7 authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

clocksource: nomadik-mtu: fix up clocksource/timer 



The Nomadik clocksource driver has had a bad define making it
impossible to use it for sched_clock() for a while. Fix this
and also enable it for the Nomadik.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 772ba2ff

arch/arm/mach-nomadik/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ config ARCH_NOMADIK 
	select ARM_AMBA

	select ARM_VIC

	select CLKSRC_NOMADIK_MTU

	select CLKSRC_NOMADIK_MTU_SCHED_CLOCK

	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

drivers/clocksource/nomadik-mtu.c

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static u32 clk_prescale; 
static u32 nmdk_cycle;		/* write-once */

static struct delay_timer mtu_delay_timer;



#ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK

#ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK

/*

 * Override the global weak sched_clock symbol with this

 * local implementation which uses the clocksource to get some
@@ -233,7 +233,7 @@ void __init nmdk_timer_init(void __iomem *base, int irq) 
		pr_err("timer: failed to initialize clock source %s\n",

		       "mtu_0");



#ifdef CONFIG_NOMADIK_MTU_SCHED_CLOCK

#ifdef CONFIG_CLKSRC_NOMADIK_MTU_SCHED_CLOCK

	setup_sched_clock(nomadik_read_sched_clock, 32, rate);

#endif