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

Commit c161e40f authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Don't enable GENERIC_TIME for the CMT clockevent driver yet. 



GENERIC_TIME still depends on the clocksource bits being there, which is
presently not supported. This allows the CMT clockevent driver to be used
alongside alternate system timers that do not yet provide a clocksource
of their own (MTU2 and so on in the case of SH-2A).

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent d63f3a58

arch/sh/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ config SH_CMT 
config SH_TIMER_CMT

	bool "CMT clockevents driver"

	depends on SYS_SUPPORTS_CMT && !SH_CMT

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS



config SH_MTU2

arch/sh/kernel/time_32.c

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ int do_settimeofday(struct timespec *tv) 
EXPORT_SYMBOL(do_settimeofday);

#endif /* !CONFIG_GENERIC_TIME */



#ifndef CONFIG_GENERIC_CLOCKEVENTS

/* last time the RTC clock got updated */

static long last_rtc_update;
@@ -148,7 +147,6 @@ void handle_timer_tick(void) 
	update_process_times(user_mode(get_irq_regs()));

#endif

}

#endif /* !CONFIG_GENERIC_CLOCKEVENTS */



#ifdef CONFIG_PM

int timer_suspend(struct sys_device *dev, pm_message_t state)