[PATCH 1/8] sh: timer rewrite V2, base code

[Magnus Damm <magnus.damm@gmail.com>]

From: Magnus Damm <damm@igel.co.jp>

SuperH timer base code V2 supporting:
- hardware configuration kept with other processor parameters
- compile time CONFIG_SH_TIMER switch
- using CONFIG_GENERIC_TIME and CONFIG_GENERIC_CLOCKEVENTS
- sharing of drivers with other architectures

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 Changes since V1 include:
 - Removed sysdev stuff
 - Timer code setup from time_init()
 - Use plat_timer_setup() in cpu code.

 arch/sh/Kconfig                |   12 +++++--
 arch/sh/kernel/time_32.c       |   33 +++++++++++---------
 drivers/clocksource/Makefile   |    1 
 drivers/clocksource/sh_timer.c |   64 ++++++++++++++++++++++++++++++++++++++++
 include/linux/sh_timer.h       |   35 +++++++++++++++++++++
 5 files changed, 127 insertions(+), 18 deletions(-)

--- 0001/arch/sh/Kconfig
+++ work/arch/sh/Kconfig	2008-11-25 20:15:08.000000000 +0900
@@ -384,10 +384,15 @@ source "arch/sh/boards/Kconfig"
 
 menu "Timer and clock configuration"
 
+config SH_TIMER
+	def_bool n
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+
 config SH_TMU
 	def_bool y
 	prompt "TMU timer support"
-	depends on CPU_SH3 || CPU_SH4
+	depends on !SH_TIMER && (CPU_SH3 || CPU_SH4)
 	select GENERIC_TIME
 	select GENERIC_CLOCKEVENTS
 	help
@@ -396,18 +401,19 @@ config SH_TMU
 config SH_CMT
 	def_bool y
 	prompt "CMT timer support"
-	depends on CPU_SH2 && !CPU_SUBTYPE_MXG
+	depends on !SH_TIMER && CPU_SH2 && !CPU_SUBTYPE_MXG
 	help
 	  This enables the use of the CMT as the system timer.
 
 config SH_MTU2
 	def_bool n
 	prompt "MTU2 timer support"
-	depends on CPU_SH2A
+	depends on !SH_TIMER && CPU_SH2A
 	help
 	  This enables the use of the MTU2 as the system timer.
 
 config SH_TIMER_IRQ
+	depends on !SH_TIMER
 	int
 	default "28" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || \
 			CPU_SUBTYPE_SH7763
--- 0001/arch/sh/kernel/time_32.c
+++ work/arch/sh/kernel/time_32.c	2008-11-25 20:17:41.000000000 +0900
@@ -18,6 +18,7 @@
 #include <linux/clockchips.h>
 #include <linux/mc146818rtc.h>	/* for rtc_lock */
 #include <linux/smp.h>
+#include <linux/sh_timer.h>
 #include <asm/clock.h>
 #include <asm/rtc.h>
 #include <asm/timer.h>
@@ -41,14 +42,6 @@ static int null_rtc_set_time(const time_
 	return 0;
 }
 
-/*
- * Null high precision timer functions for systems lacking one.
- */
-static cycle_t null_hpt_read(void)
-{
-	return 0;
-}
-
 void (*rtc_sh_get_time)(struct timespec *) = null_rtc_get_time;
 int (*rtc_sh_set_time)(const time_t) = null_rtc_set_time;
 
@@ -185,7 +178,7 @@ int timer_resume(struct sys_device *dev)
 #define timer_suspend NULL
 #define timer_resume NULL
 #endif
-
+#ifndef CONFIG_SH_TIMER
 static struct sysdev_class timer_sysclass = {
 	.name	 = "timer",
 	.suspend = timer_suspend,
@@ -202,17 +195,24 @@ static int __init timer_init_sysfs(void)
 	return sysdev_register(&sys_timer->dev);
 }
 device_initcall(timer_init_sysfs);
-
+#endif
 void (*board_time_init)(void);
-
+#ifndef CONFIG_SH_TIMER
 /*
  * Shamelessly based on the MIPS and Sparc64 work.
  */
-static unsigned long timer_ticks_per_nsec_quotient __read_mostly;
 unsigned long sh_hpt_frequency = 0;
-
+static unsigned long timer_ticks_per_nsec_quotient __read_mostly;
 #define NSEC_PER_CYC_SHIFT	10
 
+/*
+ * Null high precision timer functions for systems lacking one.
+ */
+static cycle_t null_hpt_read(void)
+{
+	return 0;
+}
+
 static struct clocksource clocksource_sh = {
 	.name		= "SuperH",
 	.rating		= 200,
@@ -243,6 +243,7 @@ unsigned long long sched_clock(void)
 	return (ticks * timer_ticks_per_nsec_quotient) >> NSEC_PER_CYC_SHIFT;
 }
 #endif
+#endif
 
 void __init time_init(void)
 {
@@ -258,7 +259,9 @@ void __init time_init(void)
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 	local_timer_setup(smp_processor_id());
 #endif
-
+#ifdef CONFIG_SH_TIMER
+	sh_timer_init();
+#else
 	/*
 	 * Find the timer to use as the system timer, it will be
 	 * initialized for us.
@@ -276,7 +279,7 @@ void __init time_init(void)
 		printk("Using %lu.%03lu MHz high precision timer.\n",
 		       ((sh_hpt_frequency + 500) / 1000) / 1000,
 		       ((sh_hpt_frequency + 500) / 1000) % 1000);
-
+#endif
 #if defined(CONFIG_SH_KGDB)
 	/*
 	 * Set up kgdb as requested. We do it here because the serial
--- 0001/drivers/clocksource/Makefile
+++ work/drivers/clocksource/Makefile	2008-11-25 20:15:08.000000000 +0900
@@ -2,3 +2,4 @@ obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_cl
 obj-$(CONFIG_X86_CYCLONE_TIMER)	+= cyclone.o
 obj-$(CONFIG_X86_PM_TIMER)	+= acpi_pm.o
 obj-$(CONFIG_SCx200HR_TIMER)	+= scx200_hrt.o
+obj-$(CONFIG_SH_TIMER)		+= sh_timer.o
--- /dev/null
+++ work/drivers/clocksource/sh_timer.c	2008-11-25 20:18:41.000000000 +0900
@@ -0,0 +1,64 @@
+/*
+ * SuperH Timer Support
+ *
+ * Copyright (C) 2008 Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <linux/init.h>
+#include <linux/bootmem.h>
+#include <linux/sh_timer.h>
+
+struct early_timer *sh_timers_early[] = {
+};
+
+static struct sh_timer_config *sh_timer_timers;
+static int sh_timer_nr_timers;
+
+void sh_timer_register(struct sh_timer_config *timers, int nr_timers)
+{
+	sh_timer_timers = timers;
+	sh_timer_nr_timers = nr_timers;
+}
+
+int __init sh_timer_init(void)
+{
+	struct sh_timer_config *cfg;
+	struct early_timer *etp;
+	void *vp;
+	int k, n;
+
+	plat_timer_setup();
+
+	for (k = 0; k < sh_timer_nr_timers; k++) {
+		cfg = sh_timer_timers + k;
+		n = cfg->type;
+
+		if (n < SH_TIMER_TYPE_NR && sh_timers_early[n]) {
+			etp = sh_timers_early[n];
+			vp = alloc_bootmem(etp->priv_size);
+
+			if (etp->setup(vp, cfg)) {
+				free_bootmem((unsigned long)vp, etp->priv_size);
+				pr_warning("sh_timer: unable to setup timer\n");
+			}
+		}
+	}
+
+	if (!sh_timer_nr_timers)
+		pr_warning("sh_timer: no timer configuration\n");
+
+	return 0;
+}
--- /dev/null
+++ work/include/linux/sh_timer.h	2008-11-25 20:20:35.000000000 +0900
@@ -0,0 +1,35 @@
+#ifndef __SH_TIMER_H__
+#define __SH_TIMER_H__
+/*
+ * SuperH Timer Support
+ *
+ * Timer devices are defined by the processor-specific code using
+ * an array of struct sh_timer_config. This array is registered
+ * using sh_timer_register(). Flags can be passed to the driver
+ * using the flags variable.
+ */
+
+struct early_timer {
+	int priv_size;
+	int (*setup)(void *priv, void *config);
+};
+
+enum sh_timer_type { SH_TIMER_TYPE_NR };
+
+struct sh_timer_config {
+	enum sh_timer_type type;
+	unsigned long flags;
+
+	char *name;
+	unsigned long base;
+	unsigned long channel_offset;
+	int timer_bit;
+	char *clk;
+	int irq;
+};
+
+void sh_timer_register(struct sh_timer_config *timers, int nr);
+int sh_timer_init(void);
+void plat_timer_setup(void);
+
+#endif /* __SH_TIMER_H__ */