mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 22:20:45 +00:00
avr32: Move cpu_hz to arch_global_data
Move this field into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
1c865d5897
commit
3d0f8c8f80
4 changed files with 7 additions and 7 deletions
|
@ -47,7 +47,7 @@ int cpu_init(void)
|
|||
{
|
||||
extern void _evba(void);
|
||||
|
||||
gd->cpu_hz = CONFIG_SYS_OSC0_HZ;
|
||||
gd->arch.cpu_hz = CONFIG_SYS_OSC0_HZ;
|
||||
|
||||
/* TODO: Move somewhere else, but needs to be run before we
|
||||
* increase the clock frequency. */
|
||||
|
@ -59,7 +59,7 @@ int cpu_init(void)
|
|||
clk_init();
|
||||
|
||||
/* Update the CPU speed according to the PLL configuration */
|
||||
gd->cpu_hz = get_cpu_clk_rate();
|
||||
gd->arch.cpu_hz = get_cpu_clk_rate();
|
||||
|
||||
/* Set up the exception handler table and enable exceptions */
|
||||
sysreg_write(EVBA, (unsigned long)&_evba);
|
||||
|
|
|
@ -46,7 +46,7 @@ static unsigned long tb_factor;
|
|||
|
||||
unsigned long get_tbclk(void)
|
||||
{
|
||||
return gd->cpu_hz;
|
||||
return gd->arch.cpu_hz;
|
||||
}
|
||||
|
||||
unsigned long long get_ticks(void)
|
||||
|
@ -115,8 +115,8 @@ int timer_init(void)
|
|||
sysreg_write(COUNT, 0);
|
||||
|
||||
tmp = (u64)CONFIG_SYS_HZ << 32;
|
||||
tmp += gd->cpu_hz / 2;
|
||||
do_div(tmp, gd->cpu_hz);
|
||||
tmp += gd->arch.cpu_hz / 2;
|
||||
do_div(tmp, gd->arch.cpu_hz);
|
||||
tb_factor = (u32)tmp;
|
||||
|
||||
if (set_interrupt_handler(0, &timer_interrupt_handler, 3))
|
||||
|
|
|
@ -25,6 +25,7 @@
|
|||
/* Architecture-specific global data */
|
||||
struct arch_global_data {
|
||||
unsigned long stack_end; /* highest stack address */
|
||||
unsigned long cpu_hz; /* cpu core clock frequency */
|
||||
};
|
||||
|
||||
/*
|
||||
|
@ -46,7 +47,6 @@ typedef struct global_data {
|
|||
unsigned long reloc_off; /* Relocation Offset */
|
||||
unsigned long env_addr; /* Address of env struct */
|
||||
unsigned long env_valid; /* Checksum of env valid? */
|
||||
unsigned long cpu_hz; /* cpu core clock frequency */
|
||||
#if defined(CONFIG_LCD)
|
||||
void *fb_base; /* framebuffer address */
|
||||
#endif
|
||||
|
|
|
@ -109,7 +109,7 @@ static struct tag *setup_clock_tags(struct tag *params)
|
|||
params->hdr.size = tag_size(tag_clock);
|
||||
params->u.clock.clock_id = ACLOCK_BOOTCPU;
|
||||
params->u.clock.clock_flags = 0;
|
||||
params->u.clock.clock_hz = gd->cpu_hz;
|
||||
params->u.clock.clock_hz = gd->arch.cpu_hz;
|
||||
|
||||
#ifdef CONFIG_AT32AP7000
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue