summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/global_data.h
diff options
context:
space:
mode:
authorReinhard Meyer <u-boot@emk-elektronik.de>2010-10-05 16:54:35 +0200
committerReinhard Meyer <u-boot@emk-elektronik.de>2010-10-19 15:12:29 +0200
commit5dca710a3d7703e41da0e9894f2d71f9e25bea6b (patch)
tree0a0dd7439012b2890bee1501eb183d63f4ca2042 /arch/arm/include/asm/global_data.h
parent3b83522bcf99bb4cdf1b792f391e3b93b6ed5ce5 (diff)
downloadtalos-obmc-uboot-5dca710a3d7703e41da0e9894f2d71f9e25bea6b.tar.gz
talos-obmc-uboot-5dca710a3d7703e41da0e9894f2d71f9e25bea6b.zip
AT91 clock/timer: move static data to global_data struct
clock.c / timer.c used static data and are called before relocation. Move all static variables into global_data structure. Also cleanup timer.c from unused stubs and make it truly use 64 bit tick values. Signed-off-by: Reinhard Meyer <u-boot@emk-elektronik.de>
Diffstat (limited to 'arch/arm/include/asm/global_data.h')
-rw-r--r--arch/arm/include/asm/global_data.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 6152f348f3..6dae4328e6 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -47,6 +47,20 @@ typedef struct global_data {
#ifdef CONFIG_FSL_ESDHC
unsigned long sdhc_clk;
#endif
+#ifdef CONFIG_AT91FAMILY
+ /* "static data" needed by at91's clock.c */
+ unsigned long cpu_clk_rate_hz;
+ unsigned long main_clk_rate_hz;
+ unsigned long mck_rate_hz;
+ unsigned long plla_rate_hz;
+ unsigned long pllb_rate_hz;
+ unsigned long at91_pllb_usb_init;
+ /* "static data" needed by at91's timer.c */
+ unsigned long timer_rate_hz;
+ unsigned long tbl;
+ unsigned long tbu;
+ unsigned long long timer_reset_value;
+#endif
#if !defined(CONFIG_SYS_ARM_WITHOUT_RELOC)
unsigned long relocaddr; /* Start address of U-Boot in RAM */
phys_size_t ram_size; /* RAM size */
OpenPOWER on IntegriCloud