diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-02 16:00:10 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-02 16:00:10 +0100 |
| commit | 77524d2c9d81e97c54e704b65c8a02e4bec0f441 (patch) | |
| tree | 59a4ec271a84c57b4b5127d81ac97ea176ebff85 /include/configs/pm9261.h | |
| parent | d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2 (diff) | |
| parent | d07e2b598a690d6eb75019b379fc4933affe3d2c (diff) | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/pm9261.h')
| -rw-r--r-- | include/configs/pm9261.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index fc95cf0bfa..acf6d610e7 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -50,15 +50,13 @@ #define CONFIG_SYS_MCKR1_VAL \ (AT91_PMC_MCKR_CSS_SLOW | \ AT91_PMC_MCKR_PRES_1 | \ - AT91_PMC_MCKR_MDIV_2 | \ - AT91_PMC_MCKR_PLLADIV_1) + AT91_PMC_MCKR_MDIV_2) /* PCK/2 = MCK Master Clock from PLLA */ #define CONFIG_SYS_MCKR2_VAL \ (AT91_PMC_MCKR_CSS_PLLA | \ AT91_PMC_MCKR_PRES_1 | \ - AT91_PMC_MCKR_MDIV_2 | \ - AT91_PMC_MCKR_PLLADIV_1) + AT91_PMC_MCKR_MDIV_2) /* define PDC[31:16] as DATA[31:16] */ #define CONFIG_SYS_PIOC_PDR_VAL1 0xFFFF0000 |