コミット: 773502668478573ab38ad2e84187a6053a6b831a - uboot (git)

コミットメタ情報

• リビジョン: 773502668478573ab38ad2e84187a6053a6b831a (tree)
• 日時: 2016-05-26 23:01:36
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

sh: timer driver

Signed-off-by: Yoshinori Sato <[e-mail]>

変更サマリ

• modified: arch/sh/lib/Makefile
• modified: drivers/timer/Kconfig
• modified: drivers/timer/Makefile
• add: drivers/timer/sh3_timer.c
• modified: drivers/timer/sh4_timer.c

差分

--- a/arch/sh/lib/Makefile
+++ b/arch/sh/lib/Makefile
@@ -7,6 +7,7 @@
 
 
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
+ifndef CONFIG_DM
 ifneq ($(CONFIG_TIMER)$(CONFIG_SPL_BUILD),y)
 ifeq ($(CONFIG_CPU_SH2),y)
 obj-y	+= time_sh2.o
@@ -14,6 +15,7 @@ else
 obj-y	+= time.o
 endif
 endif
+endif
 obj-$(CONFIG_CMD_SH_ZIMAGEBOOT) += zimageboot.o
 
 udivsi3-y			:= udivsi3_i4i-Os.o

--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -46,6 +46,12 @@ config OMAP_TIMER
 	help
 	  Select this to enable an timer for Omap devices.
 
+config SH3_TIMER
+	bool "SH3 timer support"
+	depends on TIMER
+	help
+	  Select this to enable an timer for SH4 devices.
+
 config SH4_TIMER
 	bool "SH4 timer support"
 	depends on TIMER

--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_ALTERA_TIMER)	+= altera_timer.o
 obj-$(CONFIG_SANDBOX_TIMER)	+= sandbox_timer.o
 obj-$(CONFIG_X86_TSC_TIMER)	+= tsc_timer.o
 obj-$(CONFIG_OMAP_TIMER)	+= omap-timer.o
+obj-$(CONFIG_SH3_TIMER)		+= sh3_timer.o
 obj-$(CONFIG_SH4_TIMER)		+= sh4_timer.o

--- /dev/null
+++ b/drivers/timer/sh3_timer.c
@@ -0,0 +1,83 @@
+/*
+ * (C) Copyright 2016
+ * Yoshinori Sato <[e-mail]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <timer.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct sh3_timer_platdata {
+	unsigned char *regs;
+	int ch;
+};
+
+static int timer_read_counter(struct udevice *dev, u64 *count)
+{
+	struct sh3_timer_platdata *plat = dev_get_platdata(dev);
+
+	*count = timer_conv_64(~readl(plat->regs + 4 + plat->ch * 12 + 4));
+	return 0;
+}
+
+static void tmu_timer_start(unsigned char *reg, unsigned int timer)
+{
+	if (timer > 2)
+		return;
+	writeb(readb(reg + 2) | (1 << timer), reg + 2);
+}
+
+static void tmu_timer_stop(unsigned char *reg, unsigned int timer)
+{
+	if (timer > 2)
+		return;
+	writeb(readb(reg + 2) & ~(1 << timer), reg + 2);
+}
+
+static int sh3_timer_probe(struct udevice *dev)
+{
+	struct sh3_timer_platdata *plat = dev_get_platdata(dev);
+
+	writew(0, plat->regs + 4 + (plat->ch * 12) + 8);
+
+	tmu_timer_stop(plat->regs, plat->ch);
+	tmu_timer_start(plat->regs, plat->ch);
+
+	return 0;
+}
+
+static int sh3_timer_ofdata_to_platdata(struct udevice *dev)
+{
+	struct sh3_timer_platdata *plat = dev_get_platdata(dev);
+
+	plat->regs = map_physmem(dev_get_addr(dev), 48, MAP_NOCACHE);
+	plat->ch = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+				  "renesas,channel", 0);
+	return 0;
+}
+
+static const struct timer_ops sh3_timer_ops = {
+	.get_count = timer_read_counter,
+};
+
+static const struct udevice_id sh3_timer_ids[] = {
+	{ .compatible = "renesas,sh3-tmu" },
+	{}
+};
+
+U_BOOT_DRIVER(sh3_timer) = {
+	.name	= "sh3_timer",
+	.id	= UCLASS_TIMER,
+	.of_match = of_match_ptr(sh3_timer_ids),
+	.ofdata_to_platdata = of_match_ptr(sh3_timer_ofdata_to_platdata),
+	.platdata_auto_alloc_size = sizeof(struct sh3_timer_platdata),
+	.probe = sh3_timer_probe,
+	.ops	= &sh3_timer_ops,
+	.flags = DM_FLAG_PRE_RELOC,
+};

--- a/drivers/timer/sh4_timer.c
+++ b/drivers/timer/sh4_timer.c
@@ -1,12 +1,6 @@
 /*
- * (C) Copyright 2009
- * Jean-Christophe PLAGNIOL-VILLARD <[e-mail]>
- *
- * (C) Copyright 2007-2012
- * Nobobuhiro Iwamatsu <[e-mail]>
- *
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, [e-mail].
+ * (C) Copyright 2016
+ * Yoshinori Sato <[e-mail]>
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */