diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 18:01:22 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 18:01:22 +0200 |
| commit | 6a84872a3c3090993be108f02f91b4de062a7d32 (patch) | |
| tree | eb9029dda4b56efdc1488a8683c00c711075ca18 /include/linux/clk/at91_pmc.h | |
| parent | d82b40133f2a7d50e491cecb64e4ea01dabd8672 (diff) | |
| parent | 138e8f1c4e99cd349e50fd8b18aebbd2716ceb87 (diff) | |
| download | linux-stable-6a84872a3c3090993be108f02f91b4de062a7d32.tar.gz linux-stable-6a84872a3c3090993be108f02f91b4de062a7d32.tar.bz2 linux-stable-6a84872a3c3090993be108f02f91b4de062a7d32.zip | |
Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3
Diffstat (limited to 'include/linux/clk/at91_pmc.h')
| -rw-r--r-- | include/linux/clk/at91_pmc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clk/at91_pmc.h b/include/linux/clk/at91_pmc.h index a6911ebbd02a..de4268d4987a 100644 --- a/include/linux/clk/at91_pmc.h +++ b/include/linux/clk/at91_pmc.h @@ -155,6 +155,7 @@ extern void __iomem *at91_pmc_base; #define AT91_PMC_LOCKB (1 << 2) /* PLLB Lock */ #define AT91_PMC_MCKRDY (1 << 3) /* Master Clock */ #define AT91_PMC_LOCKU (1 << 6) /* UPLL Lock [some SAM9] */ +#define AT91_PMC_OSCSEL (1 << 7) /* Slow Oscillator Selection [some SAM9] */ #define AT91_PMC_PCK0RDY (1 << 8) /* Programmable Clock 0 */ #define AT91_PMC_PCK1RDY (1 << 9) /* Programmable Clock 1 */ #define AT91_PMC_PCK2RDY (1 << 10) /* Programmable Clock 2 */ |