minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-15 15:06:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

ixp: Move timestamp to arch_global_data

Browse Source 
Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-13 20:48:37 +00:00 committed by Tom Rini
parent 5f70714c2f
commit b4d51db86b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/cpu/ixp/timer.c
View File

@ -70,14 +70,14 @@ unsigned long long get_ticks(void)
if (readl(IXP425_OSST) & IXP425_OSST_TIMER_TS_PEND) { if (readl(IXP425_OSST) & IXP425_OSST_TIMER_TS_PEND) {
/* rollover of timestamp timer register */ /* rollover of timestamp timer register */
gd->timestamp += (0xFFFFFFFF - gd->arch.lastinc) + now + 1; gd->arch.timestamp += (0xFFFFFFFF - gd->arch.lastinc) + now + 1;
writel(IXP425_OSST_TIMER_TS_PEND, IXP425_OSST); writel(IXP425_OSST_TIMER_TS_PEND, IXP425_OSST);
} else { } else {
/* move stamp forward with absolut diff ticks */ /* move stamp forward with absolut diff ticks */
gd->timestamp += (now - gd->arch.lastinc); gd->arch.timestamp += (now - gd->arch.lastinc);
} }
gd->arch.lastinc = now; gd->arch.lastinc = now;
return gd->timestamp; return gd->arch.timestamp;
} }
@ -86,7 +86,7 @@ void reset_timer_masked(void)
/* capture current timestamp counter */ /* capture current timestamp counter */
gd->arch.lastinc = readl(IXP425_OSTS_B); gd->arch.lastinc = readl(IXP425_OSTS_B);
/* start "advancing" time stamp from 0 */ /* start "advancing" time stamp from 0 */
gd->timestamp = 0; gd->arch.timestamp = 0;
} }
ulong get_timer_masked(void) ulong get_timer_masked(void)

6
arch/arm/include/asm/global_data.h
View File

@ -41,6 +41,9 @@ struct arch_global_data {
unsigned long tbl; unsigned long tbl;
unsigned long lastinc; unsigned long lastinc;
unsigned long long timer_reset_value; unsigned long long timer_reset_value;
#ifdef CONFIG_IXP425
unsigned long timestamp;
#endif
}; };
/* /*
@ -64,9 +67,6 @@ typedef struct global_data {
unsigned long fb_base; /* base address of frame buffer */ unsigned long fb_base; /* base address of frame buffer */
#ifdef CONFIG_FSL_ESDHC #ifdef CONFIG_FSL_ESDHC
unsigned long sdhc_clk; unsigned long sdhc_clk;
#endif
#ifdef CONFIG_IXP425
unsigned long timestamp;
#endif #endif
unsigned long relocaddr; /* Start address of U-Boot in RAM */ unsigned long relocaddr; /* Start address of U-Boot in RAM */
phys_size_t ram_size; /* RAM size */ phys_size_t ram_size; /* RAM size */