diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-05 20:50:39 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-05 20:50:39 +0100 |
| commit | c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d (patch) | |
| tree | da81a7a9b2616bfb0db1331089b390c7c92af247 /arch | |
| parent | f6723794fd8f3362c4f3b5d0f36607a6a6f107b2 (diff) | |
| parent | c12f941bece9ed79efccfe9e4a9fd977da6975f9 (diff) | |
| download | blackbird-obmc-uboot-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.tar.gz blackbird-obmc-uboot-c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d.zip | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91_pmc.h | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-at91/at91_rstc.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-at91/at91_pmc.h b/arch/arm/include/asm/arch-at91/at91_pmc.h index 003920cd84..7b36f74f83 100644 --- a/arch/arm/include/asm/arch-at91/at91_pmc.h +++ b/arch/arm/include/asm/arch-at91/at91_pmc.h @@ -233,6 +233,8 @@ typedef struct at91_pmc { #endif #define AT91_PMC_USBS_USB_PLLA (0x0) /* USB Clock Input is PLLA */ #define AT91_PMC_USBS_USB_UPLL (0x1) /* USB Clock Input is UPLL */ +#define AT91_PMC_USBS_USB_PLLB (0x1) /* USB Clock Input is PLLB, AT91SAM9N12 only */ +#define AT91_PMC_USB_DIV_2 (0x1 << 8) /* USB Clock divided by 2 */ #define AT91_PMC_USBDIV_8 (0x7 << 8) /* USB Clock divided by 8 */ #define AT91_PMC_USBDIV_10 (0x9 << 8) /* USB Clock divided by 10 */ diff --git a/arch/arm/include/asm/arch-at91/at91_rstc.h b/arch/arm/include/asm/arch-at91/at91_rstc.h index 423cf515d9..a9423428e7 100644 --- a/arch/arm/include/asm/arch-at91/at91_rstc.h +++ b/arch/arm/include/asm/arch-at91/at91_rstc.h @@ -38,4 +38,11 @@ typedef struct at91_rstc { #define AT91_RSTC_SR_NRSTL 0x00010000 +#define AT91_RSTC_RSTTYP (7 << 8) /* Reset Type */ +#define AT91_RSTC_RSTTYP_GENERAL (0 << 8) +#define AT91_RSTC_RSTTYP_WAKEUP (1 << 8) +#define AT91_RSTC_RSTTYP_WATCHDOG (2 << 8) +#define AT91_RSTC_RSTTYP_SOFTWARE (3 << 8) +#define AT91_RSTC_RSTTYP_USER (4 << 8) + #endif |
