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

Commit 8be5f1a6 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Kill off the remnants of the old timer code. 



Now with all of the TMU users moved over to the new TMU driver, and the
old TMU driver killed off, the left-over infrastructure can go along
with it.

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

arch/sh/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -494,17 +494,6 @@ config SH_TIMER_MTU2 
	help

	  This enables build of the MTU2 timer driver.



config SH_TIMER_IRQ

	int

	default "28" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || \

			CPU_SUBTYPE_SH7763

	default "86" if CPU_SUBTYPE_SH7619

	default "140" if CPU_SUBTYPE_SH7206

	default "142" if CPU_SUBTYPE_SH7203 && SH_CMT

	default "153" if CPU_SUBTYPE_SH7203 && SH_MTU2

	default "238" if CPU_SUBTYPE_MXG

	default "16"



config SH_PCLK_FREQ

	int "Peripheral clock frequency (in Hz)"

	default "27000000" if CPU_SUBTYPE_SH7343

arch/sh/include/asm/timer.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#ifndef __ASM_SH_TIMER_H

#define __ASM_SH_TIMER_H



#include <linux/sysdev.h>

#include <linux/clocksource.h>

#include <cpu/timer.h>



struct sys_timer_ops {

	int (*init)(void);

	int (*start)(void);

	int (*stop)(void);

};



struct sys_timer {

	const char		*name;



	struct sys_device	dev;

	struct sys_timer_ops	*ops;

};



extern struct sys_timer *sys_timer;



/* arch/sh/kernel/timers/timer.c */

struct sys_timer *get_sys_timer(void);



extern struct clocksource clocksource_sh;



#endif /* __ASM_SH_TIMER_H */

arch/sh/kernel/Makefile_32

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ obj-y := debugtraps.o idle.o io.o io_generic.o irq.o \ 
	   sys_sh.o sys_sh32.o syscalls_32.o time.o topology.o	\

	   traps.o traps_32.o



obj-y				+= cpu/ timers/

obj-y				+= cpu/

obj-$(CONFIG_VSYSCALL)		+= vsyscall/

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SH_STANDARD_BIOS)	+= sh_bios.o

arch/sh/kernel/Makefile_64

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ obj-y := debugtraps.o idle.o io.o io_generic.o irq.o machvec.o process_64.o \ 
	   ptrace_64.o setup.o signal_64.o sys_sh.o sys_sh64.o \

	   syscalls_64.o time.o topology.o traps.o traps_64.o



obj-y				+= cpu/ timers/

obj-y				+= cpu/

obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_SH_CPU_FREQ)	+= cpufreq.o

obj-$(CONFIG_MODULES)		+= sh_ksyms_64.o module.o

arch/sh/kernel/cpu/clock.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/platform_device.h>

#include <linux/proc_fs.h>

#include <asm/clock.h>

#include <asm/timer.h>



static LIST_HEAD(clock_list);

static DEFINE_SPINLOCK(clock_lock);