V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

pxa: fixing get_timer to return time in miliseconds. 

Fixing the get_timer function to return time in miliseconds instead of
ticks. Also fixed PXA boards to use the conventional value of 1000 for
CONFIG_SYS_HZ.

Signed-off-by: Micha Kalfon <smichak.uv@gmail.com>
This commit is contained in:
Micha Kalfon 2009-02-11 19:50:11 +02:00 committed by Jean-Christophe PLAGNIOL-VILLARD
parent e5e88c3614
commit 94a3312920
16 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cpu/pxa/interrupts.c
View File

@ -33,6 +33,14 @@
#error: interrupts not implemented yet #error: interrupts not implemented yet
#endif #endif
#if defined(CONFIG_PXA27X) || defined(CONFIG_CPU_MONAHANS)
#define TIMER_FREQ_HZ 3250000
#elif defined(CONFIG_PXA250)
#define TIMER_FREQ_HZ 3686400
#else
#error "Timer frequency unknown - please config PXA CPU type"
#endif
int interrupt_init (void) int interrupt_init (void)
{ {
/* nothing happens here - we don't setup any IRQs */ /* nothing happens here - we don't setup any IRQs */
@ -67,7 +75,10 @@ void reset_timer_masked (void)
ulong get_timer_masked (void) ulong get_timer_masked (void)
{ {
return OSCR; unsigned long long ticks = get_ticks();
return (((ticks / TIMER_FREQ_HZ) * 1000) +
((ticks % TIMER_FREQ_HZ) * 1000) / TIMER_FREQ_HZ);
} }
void udelay_masked (unsigned long usec) void udelay_masked (unsigned long usec)
@ -78,17 +89,17 @@ void udelay_masked (unsigned long usec)
if (usec >= 1000) { if (usec >= 1000) {
tmo = usec / 1000; tmo = usec / 1000;
tmo *= CONFIG_SYS_HZ; tmo *= TIMER_FREQ_HZ;
tmo /= 1000; tmo /= 1000;
} else { } else {
tmo = usec * CONFIG_SYS_HZ; tmo = usec * TIMER_FREQ_HZ;
tmo /= (1000*1000); tmo /= (1000*1000);
} }
endtime = get_timer_masked () + tmo; endtime = get_ticks() + tmo;
do { do {
ulong now = get_timer_masked (); ulong now = get_ticks();
diff = endtime - now; diff = endtime - now;
} while (diff >= 0); } while (diff >= 0);
} }
@ -99,7 +110,7 @@ void udelay_masked (unsigned long usec)
*/ */
unsigned long long get_ticks(void) unsigned long long get_ticks(void)
{ {
return get_timer(0); return OSCR;
} }
/* /*
@ -109,6 +120,6 @@ unsigned long long get_ticks(void)
ulong get_tbclk (void) ulong get_tbclk (void)
{ {
ulong tbclk; ulong tbclk;
tbclk = CONFIG_SYS_HZ; tbclk = TIMER_FREQ_HZ;
return tbclk; return tbclk;
} }

2
include/configs/cerf250.h
View File

@ -117,7 +117,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 400/200/100 MHz */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }

2
include/configs/cradle.h
View File

@ -103,7 +103,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */
/* valid baudrates */ /* valid baudrates */

2
include/configs/csb226.h
View File

@ -131,7 +131,7 @@
/* RS: is this where U-Boot is */ /* RS: is this where U-Boot is */
/* RS: relocated to in RAM? */ /* RS: relocated to in RAM? */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
/* RS: the oscillator is actually 3680130?? */ /* RS: the oscillator is actually 3680130?? */
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */
/* 0101000001 */ /* 0101000001 */

2
include/configs/delta.h
View File

@ -171,7 +171,7 @@
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */
#define CONFIG_SYS_HZ 3250000 /* incrementer freq: 3.25 MHz */ #define CONFIG_SYS_HZ 1000
/* Monahans Core Frequency */ /* Monahans Core Frequency */
#define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */ #define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */

2
include/configs/innokom.h
View File

@ -119,7 +119,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* load kernel to this address */ #define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* load kernel to this address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
/* RS: the oscillator is actually 3680130?? */ /* RS: the oscillator is actually 3680130?? */
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */

2
include/configs/logodl.h
View File

@ -112,7 +112,7 @@
#define CONFIG_SYS_LOAD_ADDR 0x08000000 /* load kernel to this address */ #define CONFIG_SYS_LOAD_ADDR 0x08000000 /* load kernel to this address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
/* RS: the oscillator is actually 3680130?? */ /* RS: the oscillator is actually 3680130?? */
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */

2
include/configs/lubbock.h
View File

@ -127,7 +127,7 @@
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */
/* valid baudrates */ /* valid baudrates */

2
include/configs/pleb2.h
View File

@ -126,7 +126,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa2000000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 200/200/100 MHz */
/* valid baudrates */ /* valid baudrates */

2
include/configs/pxa255_idp.h
View File

@ -241,7 +241,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa0800000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa0800000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */
#define RTC 1 /* enable 32KHz osc */ #define RTC 1 /* enable 32KHz osc */

2
include/configs/trizepsiv.h
View File

@ -168,7 +168,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa1000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa1000000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ #define CONFIG_SYS_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
/* valid baudrates */ /* valid baudrates */

2
include/configs/wepep250.h
View File

@ -81,7 +81,7 @@
#undef CONFIG_SYS_CLKS_IN_HZ /* use HZ for freq. display */ #undef CONFIG_SYS_CLKS_IN_HZ /* use HZ for freq. display */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x141 /* core clock - register value */ #define CONFIG_SYS_CPUSPEED 0x141 /* core clock - register value */
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }

2
include/configs/xaeniax.h
View File

@ -138,7 +138,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa1000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa1000000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x141 /* set core clock to 400/200/100 MHz */
/* /*

2
include/configs/xm250.h
View File

@ -121,7 +121,7 @@
#define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */ #define CONFIG_SYS_LOAD_ADDR 0xa3000000 /* default load address */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/400/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/400/100 MHz */
/* valid baudrates */ /* valid baudrates */

5
include/configs/xsengine.h
View File

@ -35,10 +35,7 @@
#define CONFIG_DOS_PARTITION 1 #define CONFIG_DOS_PARTITION 1
#define BOARD_LATE_INIT 1 #define BOARD_LATE_INIT 1
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */ #define CONFIG_SYS_HZ 1000
#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
#define CONFIG_SYS_HZ 3686400 /* incrementer freq: 3.6864 MHz */
#define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */ #define CONFIG_SYS_CPUSPEED 0x161 /* set core clock to 400/200/100 MHz */
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */

2
include/configs/zylonite.h
View File

@ -143,7 +143,7 @@
#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_DRAM_BASE + 0x8000) /* default load address */
#define CONFIG_SYS_HZ 3250000 /* incrementer freq: 3.25 MHz */ #define CONFIG_SYS_HZ 1000
/* Monahans Core Frequency */ /* Monahans Core Frequency */
#define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */ #define CONFIG_SYS_MONAHANS_RUN_MODE_OSC_RATIO 16 /* valid values: 8, 16, 24, 31 */