| Message ID | 1475789205-19618-7-git-send-email-clg@kaod.org |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Fri, Oct 7, 2016 at 8:26 AM, Cédric Le Goater <clg@kaod.org> wrote: > The code should not use static as it is relocated at init time. Also > add some definitions on the bits used to configure timer 1. > Unrelated to this patch; would reusing the Linux driver in u-boot be a good idea? > Signed-off-by: Cédric Le Goater <clg@kaod.org> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > arch/arm/mach-aspeed/timer.c | 21 +++++++++++++++++---- > 1 file changed, 17 insertions(+), 4 deletions(-)
On 10/10/2016 08:22 AM, Joel Stanley wrote: > On Fri, Oct 7, 2016 at 8:26 AM, Cédric Le Goater <clg@kaod.org> wrote: >> The code should not use static as it is relocated at init time. Also >> add some definitions on the bits used to configure timer 1. >> > > Unrelated to this patch; would reusing the Linux driver in u-boot be a > good idea? I remember having done a relatively quick copy/paste for what we have in uboot. So yes, It is worth a check. Thanks C.
diff --git a/arch/arm/mach-aspeed/timer.c b/arch/arm/mach-aspeed/timer.c index 3755238f173c..9ab4b3fa125d 100644 --- a/arch/arm/mach-aspeed/timer.c +++ b/arch/arm/mach-aspeed/timer.c @@ -27,17 +27,30 @@ #define TIMER_LOAD_VAL 0xffffffff #define CLK_PER_HZ (CONFIG_TIMER_CLK_FREQ / CONFIG_SYS_HZ) +/* Clock selection for Timer/Counter #1 + * Counter is base on the selected clock to count down + * + * 0: APB clock (PCLK) + * 1: External clock (1 MHz) + */ +#define TIMER_CLK_SELECT 0x2 +/* Timer enable for Timer/Counter #1 */ +#define TIMER_ENABLE 0x1 + /* macro to read the 32 bit timer */ #define READ_CLK (*(volatile ulong *)(AST_TIMER_BASE + 0)) #define READ_TIMER (READ_CLK / CLK_PER_HZ) -static ulong timestamp; -static ulong lastdec; +DECLARE_GLOBAL_DATA_PTR; + +#define timestamp (gd->arch.tbl) +#define lastdec (gd->arch.lastinc) int timer_init (void) { *(volatile ulong *)(AST_TIMER_BASE + 4) = TIMER_LOAD_VAL; - *(volatile ulong *)(AST_TIMER_BASE + 0x30) = 0x3; /* enable timer1 */ + *(volatile ulong *)(AST_TIMER_BASE + 0x30) = + TIMER_ENABLE|TIMER_CLK_SELECT; /* init the timestamp and lastdec value */ reset_timer_masked(); @@ -118,7 +131,7 @@ ulong get_timer_masked (void) /* waits specified delay value and resets timestamp */ void udelay_masked (unsigned long usec) { - __udelay(usec); + __udelay(usec); } /*
The code should not use static as it is relocated at init time. Also add some definitions on the bits used to configure timer 1. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- arch/arm/mach-aspeed/timer.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)