mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-05 18:43:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

nios2: Split timer code into timer.c

Browse Source 
Move the timer code from interrupts.c into timer.c . Eliminate the
installation of timer interrupt handler, which is no longer used.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
This commit is contained in:
Thomas Chou 2015-10-08 21:23:37 +08:00
parent fea7f3aa3e
commit e6500f86a6
4 changed files with 68 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/nios2/cpu/Makefile
View File

@ -7,5 +7,5 @@
extra-y = start.o
obj-y = exceptions.o
obj-y += cpu.o interrupts.o sysid.o traps.o
obj-y += cpu.o interrupts.o sysid.o timer.o traps.o
obj-y += fdt.o

84
arch/nios2/cpu/interrupts.c
View File

@ -14,36 +14,8 @@
#include <asm/ptrace.h>
#include <common.h>
#include <command.h>
#include <watchdog.h>
#ifdef CONFIG_STATUS_LED
#include <status_led.h>
#endif
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 int ena */
#define NIOS_TIMER_CONT (1 << 1) /* Continuous mode */
#define NIOS_TIMER_START (1 << 2) /* Start timer */
#define NIOS_TIMER_STOP (1 << 3) /* Stop timer */
#if defined(CONFIG_SYS_TIMER_BASE) && !defined(CONFIG_SYS_TIMER_IRQ)
#error CONFIG_SYS_TIMER_IRQ not defined (see documentation)
#endif
/****************************************************************************/
/*************************************************************************/
struct irq_action {
interrupt_handler_t *handler;
void *arg;
@ -52,60 +24,6 @@ struct irq_action {
static struct irq_action vecs[32];
/*************************************************************************/
static volatile ulong timestamp;
/*
* The board must handle this interrupt if a timer is not
* provided.
*/
void tmr_isr (void *arg)
{
struct nios_timer *tmr = (struct nios_timer *)arg;
/* Interrupt is cleared by writing anything to the
* status register.
*/
writel (0, &tmr->status);
timestamp += CONFIG_SYS_NIOS_TMRMS;
#ifdef CONFIG_STATUS_LED
status_led_tick(timestamp);
#endif
}
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);
/* FIXME */
irq_install_handler(CONFIG_SYS_TIMER_IRQ, tmr_isr, (void *)tmr);
return 0;
}
/*************************************************************************/
int disable_interrupts (void)
{
int val = rdctl (CTL_STATUS);

65
arch/nios2/cpu/timer.c Normal file
View File

@ -0,0 +1,65 @@
/*
* (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;
}

3
include/configs/nios2-generic.h
View File

@ -40,7 +40,6 @@
* TIMER
*/
#define CONFIG_SYS_TIMER_RATE CONFIG_SYS_TIMER_FREQ
#define CONFIG_SYS_NIOS_TMRMS 10 /* FIXME: Desired period (msec)*/
/*
* STATUS LED
@ -59,7 +58,7 @@
#define STATUS_LED_BIT 0 /* Bit-0 on GPIO */
#define STATUS_LED_STATE 1 /* Blinking */
#define STATUS_LED_PERIOD (500 / CONFIG_SYS_NIOS_TMRMS) /* 500 msec */
#define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) /* 500 msec */
/*
* BOOTP options