diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-01 00:11:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-01 00:12:07 +0200 |
| commit | d1ef5bd711b6b01e6a73cf186245d19939882706 (patch) | |
| tree | 14842d65a25839c31cf4e99ded0410d569f1a4aa /arch/arm/mach-at91/clock.c | |
| parent | 26690863e2c1fa4fee5f6137b219f4b8a1a02287 (diff) | |
| parent | cce783c608fee0716cff65926d1835a5fd097b69 (diff) | |
Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into next/newsoc
ARM: at91: Add at91sam9n12 and refence booard
* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: Add DT description files for AT91SAM9N12-EK
ARM: at91: Add machine files for AT91SAM9N12 SoC
ARM: at91: Add machine header file for AT91SAM9N12 SoC
Based on at91/dt branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/clock.c')
| -rw-r--r-- | arch/arm/mach-at91/clock.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c index a0f4d7424cdc..46130dad2d06 100644 --- a/arch/arm/mach-at91/clock.c +++ b/arch/arm/mach-at91/clock.c @@ -57,13 +57,15 @@ void __iomem *at91_pmc_base; #define cpu_has_800M_plla() ( cpu_is_at91sam9g20() \ || cpu_is_at91sam9g45() \ - || cpu_is_at91sam9x5()) + || cpu_is_at91sam9x5() \ + || cpu_is_at91sam9n12()) #define cpu_has_300M_plla() (cpu_is_at91sam9g10()) #define cpu_has_pllb() (!(cpu_is_at91sam9rl() \ || cpu_is_at91sam9g45() \ - || cpu_is_at91sam9x5())) + || cpu_is_at91sam9x5() \ + || cpu_is_at91sam9n12())) #define cpu_has_upll() (cpu_is_at91sam9g45() \ || cpu_is_at91sam9x5()) @@ -77,12 +79,15 @@ void __iomem *at91_pmc_base; || cpu_is_at91sam9x5())) #define cpu_has_plladiv2() (cpu_is_at91sam9g45() \ - || cpu_is_at91sam9x5()) + || cpu_is_at91sam9x5() \ + || cpu_is_at91sam9n12()) #define cpu_has_mdiv3() (cpu_is_at91sam9g45() \ - || cpu_is_at91sam9x5()) + || cpu_is_at91sam9x5() \ + || cpu_is_at91sam9n12()) -#define cpu_has_alt_prescaler() (cpu_is_at91sam9x5()) +#define cpu_has_alt_prescaler() (cpu_is_at91sam9x5() \ + || cpu_is_at91sam9n12()) static LIST_HEAD(clocks); static DEFINE_SPINLOCK(clk_lock); |