diff mbox

[U-Boot,v2,2/2] nios2: convert altera timer to driver model

Message ID 1443530349-14599-2-git-send-email-thomas@wytron.com.tw
State Superseded
Delegated to: Thomas Chou
Headers show

Commit Message

Thomas Chou Sept. 29, 2015, 12:39 p.m. UTC 
Convert altera timer to driver model.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
v2
  fix coding style.

 arch/nios2/cpu/Makefile         |   2 +-
 arch/nios2/cpu/timer.c          |  65 ------------------------
 common/board_f.c                |   3 +-
 configs/nios2-generic_defconfig |   2 +
 drivers/timer/Kconfig           |   7 +++
 drivers/timer/Makefile          |   1 +
 drivers/timer/altera_timer.c    | 110 ++++++++++++++++++++++++++++++++++++++++
 include/configs/nios2-generic.h |   6 ---
 8 files changed, 122 insertions(+), 74 deletions(-)
 delete mode 100644 arch/nios2/cpu/timer.c
 create mode 100644 drivers/timer/altera_timer.c

Comments

Chin Liang See Sept. 30, 2015, 12:27 a.m. UTC | #1 
Hi Thomas,


On Tue, 2015-09-29 at 07:39 +0000, thomas@wytron.com.tw wrote:
> Convert altera timer to driver model.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
> v2
>   fix coding style.
> 
>  arch/nios2/cpu/Makefile         |   2 +-
>  arch/nios2/cpu/timer.c          |  65 ------------------------
>  common/board_f.c                |   3 +-
>  configs/nios2-generic_defconfig |   2 +
>  drivers/timer/Kconfig           |   7 +++
>  drivers/timer/Makefile          |   1 +
>  drivers/timer/altera_timer.c    | 110 ++++++++++++++++++++++++++++++++++++++++
>  include/configs/nios2-generic.h |   6 ---
>  8 files changed, 122 insertions(+), 74 deletions(-)
>  delete mode 100644 arch/nios2/cpu/timer.c
>  create mode 100644 drivers/timer/altera_timer.c
> 

Thanks for the patch.
The patch looks good except it misses the changes for dts.

Thanks
Chin Liang
Thomas Chou Oct. 1, 2015, 2:51 a.m. UTC | #2 
Hi Chin Liang,

On 09/30/2015 08:27 AM, Chin Liang See wrote:
> Thanks for the patch.
> The patch looks good except it misses the changes for dts.

If you mean pre relocation, I will add a pre relocation flag, 
DM_FLAG_PRE_RELOC, to the altera_timer driver. Though I think there is 
no need to initialize the timer before relocation for nios2 and the dts 
is not changed. Those who need timer before relocation can add the 
property "u-boot,dm-pre-reloc;" to dts.

Best regards,
Thomas Chou
Thomas Chou Oct. 1, 2015, 9:12 a.m. UTC | #3 
Hi Chin Liang,

On 10/01/2015 10:51 AM, Thomas Chou wrote:
> Hi Chin Liang,
>
> On 09/30/2015 08:27 AM, Chin Liang See wrote:
>> Thanks for the patch.
>> The patch looks good except it misses the changes for dts.
>

Sorry. I guess I misunderstood. The dts binding is added.

Best regards,
Thomas Chou
diff mbox

Patch

diff --git a/arch/nios2/cpu/Makefile b/arch/nios2/cpu/Makefile
index c85e261..3fe7847 100644
--- a/arch/nios2/cpu/Makefile
+++ b/arch/nios2/cpu/Makefile
@@ -7,5 +7,5 @@ 
 
 extra-y	= start.o
 obj-y	= exceptions.o
-obj-y	+= cpu.o interrupts.o sysid.o timer.o traps.o
+obj-y	+= cpu.o interrupts.o sysid.o traps.o
 obj-y	+= fdt.o
diff --git a/arch/nios2/cpu/timer.c b/arch/nios2/cpu/timer.c
deleted file mode 100644
index b8aa9dd..0000000
--- a/arch/nios2/cpu/timer.c
+++ /dev/null
@@ -1,65 +0,0 @@ 
-/*
- * (C) Copyright 2000-2002
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
- * Scott McNutt <smcnutt@psyent.com>
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-#include <common.h>
-#include <asm/nios2.h>
-#include <asm/types.h>
-#include <asm/io.h>
-
-struct nios_timer {
-	u32	status;		/* Timer status reg */
-	u32	control;	/* Timer control reg */
-	u32	periodl;	/* Timeout period low */
-	u32	periodh;	/* Timeout period high */
-	u32	snapl;		/* Snapshot low */
-	u32	snaph;		/* Snapshot high */
-};
-
-/* status register */
-#define NIOS_TIMER_TO		(1 << 0)	/* Timeout */
-#define NIOS_TIMER_RUN		(1 << 1)	/* Timer running */
-
-/* control register */
-#define NIOS_TIMER_ITO		(1 << 0)	/* Timeout interrupt enable */
-#define NIOS_TIMER_CONT		(1 << 1)	/* Continuous mode */
-#define NIOS_TIMER_START	(1 << 2)	/* Start timer */
-#define NIOS_TIMER_STOP		(1 << 3)	/* Stop timer */
-
-/*************************************************************************/
-unsigned long notrace timer_read_counter(void)
-{
-	struct nios_timer *tmr = (struct nios_timer *)CONFIG_SYS_TIMER_BASE;
-	u32 val;
-
-	/* Trigger update */
-	writel(0x0, &tmr->snapl);
-
-	/* Read timer value */
-	val = readl(&tmr->snapl) & 0xffff;
-	val |= (readl(&tmr->snaph) & 0xffff) << 16;
-
-	return ~val;
-}
-
-int timer_init(void)
-{
-	struct nios_timer *tmr = (struct nios_timer *)CONFIG_SYS_TIMER_BASE;
-
-	writel(0, &tmr->status);
-	writel(0, &tmr->control);
-	writel(NIOS_TIMER_STOP, &tmr->control);
-
-	writel(0xffff, &tmr->periodl);
-	writel(0xffff, &tmr->periodh);
-
-	writel(NIOS_TIMER_CONT | NIOS_TIMER_START, &tmr->control);
-
-	return 0;
-}
diff --git a/common/board_f.c b/common/board_f.c
index d0a9ff7..613332e 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -795,8 +795,7 @@  static init_fnc_t init_sequence_f[] = {
 	init_timebase,
 #endif
 #if defined(CONFIG_ARM) || defined(CONFIG_MIPS) || \
-    defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32) || \
-    defined(CONFIG_NIOS2)
+		defined(CONFIG_BLACKFIN) || defined(CONFIG_NDS32)
 	timer_init,		/* initialize timer */
 #endif
 #ifdef CONFIG_SYS_ALLOC_DPRAM
diff --git a/configs/nios2-generic_defconfig b/configs/nios2-generic_defconfig
index 707ee33..dac0b62 100644
--- a/configs/nios2-generic_defconfig
+++ b/configs/nios2-generic_defconfig
@@ -18,3 +18,5 @@  CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_ALTERA_PIO=y
 CONFIG_ALTERA_JTAG_UART=y
 CONFIG_ALTERA_JTAG_UART_BYPASS=y
+CONFIG_DM_TIMER=y
+CONFIG_ALTERA_TIMER=y
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index 97014f3..70fbcda 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -6,4 +6,11 @@  config DM_TIMER
 	help
 	  Enable driver model for Timer access.
 
+config ALTERA_TIMER
+	bool "Altera Timer support"
+	depends on DM_TIMER
+	help
+	  Select this to enable an timer for Altera devices. Please find
+	  details on the "Embedded Peripherals IP User Guide" of Altera.
+
 endmenu
diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile
index 58acd7c..db8fa2b 100644
--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -5,3 +5,4 @@ 
 #
 
 obj-$(CONFIG_DM_TIMER)		+= timer-uclass.o timer.o
+obj-$(CONFIG_ALTERA_TIMER)	+= altera_timer.o
diff --git a/drivers/timer/altera_timer.c b/drivers/timer/altera_timer.c
new file mode 100644
index 0000000..8128eb6
--- /dev/null
+++ b/drivers/timer/altera_timer.c
@@ -0,0 +1,110 @@ 
+/*
+ * (C) Copyright 2000-2002
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * (C) Copyright 2004, Psyent Corporation <www.psyent.com>
+ * Scott McNutt <smcnutt@psyent.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <dm.h>
+#include <errno.h>
+#include <timer.h>
+#include <asm/io.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+struct altera_timer_regs {
+	u32	status;		/* Timer status reg */
+	u32	control;	/* Timer control reg */
+	u32	periodl;	/* Timeout period low */
+	u32	periodh;	/* Timeout period high */
+	u32	snapl;		/* Snapshot low */
+	u32	snaph;		/* Snapshot high */
+};
+
+struct altera_timer_platdata {
+	struct altera_timer_regs *regs;
+	unsigned long timerclk;
+};
+
+/* control register */
+#define ALTERA_TIMER_CONT	(1 << 1)	/* Continuous mode */
+#define ALTERA_TIMER_START	(1 << 2)	/* Start timer */
+#define ALTERA_TIMER_STOP	(1 << 3)	/* Stop timer */
+
+static int altera_timer_get_count(struct udevice *dev, unsigned long *count)
+{
+	struct altera_timer_platdata *plat = dev->platdata;
+	struct altera_timer_regs *const regs = plat->regs;
+	u32 val;
+
+	/* Trigger update */
+	writel(0x0, &regs->snapl);
+
+	/* Read timer value */
+	val = readl(&regs->snapl) & 0xffff;
+	val |= (readl(&regs->snaph) & 0xffff) << 16;
+	*count = ~val;
+
+	return 0;
+}
+
+static int altera_timer_get_rate(struct udevice *dev, unsigned long *rate)
+{
+	struct altera_timer_platdata *plat = dev->platdata;
+
+	*rate = plat->timerclk;
+
+	return 0;
+}
+
+static int altera_timer_probe(struct udevice *dev)
+{
+	struct altera_timer_platdata *plat = dev->platdata;
+	struct altera_timer_regs *const regs = plat->regs;
+
+	writel(0, &regs->status);
+	writel(0, &regs->control);
+	writel(ALTERA_TIMER_STOP, &regs->control);
+
+	writel(0xffff, &regs->periodl);
+	writel(0xffff, &regs->periodh);
+	writel(ALTERA_TIMER_CONT | ALTERA_TIMER_START, &regs->control);
+
+	return 0;
+}
+
+static int altera_timer_ofdata_to_platdata(struct udevice *dev)
+{
+	struct altera_timer_platdata *plat = dev_get_platdata(dev);
+
+	plat->regs = ioremap(dev_get_addr(dev),
+		sizeof(struct altera_timer_regs));
+	plat->timerclk = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+		"clock-frequency", 0);
+
+	return 0;
+}
+
+static const struct dm_timer_ops altera_timer_ops = {
+	.get_count = altera_timer_get_count,
+	.get_rate = altera_timer_get_rate,
+};
+
+static const struct udevice_id altera_timer_ids[] = {
+	{ .compatible = "altr,timer-1.0", },
+	{ }
+};
+
+U_BOOT_DRIVER(altera_timer) = {
+	.name	= "altera_timer",
+	.id	= UCLASS_TIMER,
+	.of_match = altera_timer_ids,
+	.ofdata_to_platdata = altera_timer_ofdata_to_platdata,
+	.platdata_auto_alloc_size = sizeof(struct altera_timer_platdata),
+	.probe = altera_timer_probe,
+	.ops	= &altera_timer_ops,
+};
diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h
index 90ccbd1..ae19676 100644
--- a/include/configs/nios2-generic.h
+++ b/include/configs/nios2-generic.h
@@ -27,12 +27,6 @@ 
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
 
 /*
- * TIMER
- */
-#define CONFIG_SYS_TIMER_COUNTS_DOWN
-#define CONFIG_SYS_TIMER_RATE		CONFIG_SYS_TIMER_FREQ
-
-/*
  * BOOTP options
  */
 #define CONFIG_BOOTP_BOOTFILESIZE