diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-19 22:10:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 22:10:47 +0200 |
| commit | 1ed3b710d04e21dd34f61cfd129cbe18bef91598 (patch) | |
| tree | f713a2980ddf7804837a88286104817d8ab5069a /arch/arm/include | |
| parent | 6d8d4ef994a7c46e34b5fe53b1af7aa4f78192bf (diff) | |
| parent | 5dca710a3d7703e41da0e9894f2d71f9e25bea6b (diff) | |
Merge branch 'at91' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/hardware.h | 1 | ||||
| -rw-r--r-- | arch/arm/include/asm/global_data.h | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-at91/hardware.h b/arch/arm/include/asm/arch-at91/hardware.h index 9f732a738e2..f5f80e0b1b1 100644 --- a/arch/arm/include/asm/arch-at91/hardware.h +++ b/arch/arm/include/asm/arch-at91/hardware.h @@ -18,6 +18,7 @@ #if defined(CONFIG_AT91RM9200) #include <asm/arch-at91/at91rm9200.h> +#define AT91_PMC_UHP AT91RM9200_PMC_UHP #elif defined(CONFIG_AT91SAM9260) || defined(CONFIG_AT91SAM9G20) #include <asm/arch/at91sam9260.h> #define AT91_BASE_MCI AT91SAM9260_BASE_MCI diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index 6152f348f33..6dae4328e68 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 */ |