diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 20:01:48 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-01-09 20:01:48 +0100 |
| commit | 612404c28a64a6df300642a1550a65dcc8e01f82 (patch) | |
| tree | 5be664967ba39c93dc27da5cc547d350e7c0fc17 /arch/arm/include/asm | |
| parent | ea33fb1a32e8e3f408b311823cabbb7453148f80 (diff) | |
| parent | ac81e1ccf7135d8004763bbf9bef1d95a03fbe92 (diff) | |
| download | blackbird-obmc-uboot-612404c28a64a6df300642a1550a65dcc8e01f82.tar.gz blackbird-obmc-uboot-612404c28a64a6df300642a1550a65dcc8e01f82.zip | |
Merge 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91sam9x5.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91sam9x5.h b/arch/arm/include/asm/arch-at91/at91sam9x5.h index 0e728c96dc..de0f1b1923 100644 --- a/arch/arm/include/asm/arch-at91/at91sam9x5.h +++ b/arch/arm/include/asm/arch-at91/at91sam9x5.h @@ -154,6 +154,8 @@ #define ATMEL_PIO_PORTS 4 #define CPU_HAS_PIO3 #define PIO_SCDR_DIV (0x3fff << 0) /* Slow Clock Divider Mask */ +#define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP +#define ATMEL_ID_UHP ATMEL_ID_UHPHS /* * at91sam9x5 specific prototypes |
