Mercurial > ecos

changeset 2148:4c18f6d7562f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/hal_platform_setup.h: Fix the PLL multiplier settings
author asl
date Tue, 28 Feb 2006 15:35:23 +0000
parents 751d90a8dae3
children ddfe9fa68b74
files packages/hal/arm/at91/at91sam7s/current/ChangeLog packages/hal/arm/at91/at91sam7s/current/include/hal_platform_setup.h
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/packages/hal/arm/at91/at91sam7s/current/ChangeLog
+++ b/packages/hal/arm/at91/at91sam7s/current/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-28  Oliver Munz <munz@speag.ch>
+
+	* include/hal_platform_setup.h: Fix the PLL multiplier settings
+	
 2006-02-25  Andrew Lunn <andrew.lunn@ascom.ch>
 
 	* misc/redboot_R[AO]M.ecm: Disable FIS and fconfig, enable
--- a/packages/hal/arm/at91/at91sam7s/current/include/hal_platform_setup.h
+++ b/packages/hal/arm/at91/at91sam7s/current/include/hal_platform_setup.h
@@ -90,7 +90,7 @@ wait_pmc_sr_1:
 
         // Set the PLL multiplier and divider. 16 slow clocks go by
 	// before the LOCK bit is set. */
-        ldr     r1,=((AT91_PMC_PLLR_DIV(CYGNUM_HAL_ARM_AT91_PLL_DIVIDER))|(AT91_PMC_PLLR_PLLCOUNT(16))|(AT91_PMC_PLLR_MUL(CYGNUM_HAL_ARM_AT91_PLL_MULTIPLIER+1)))
+        ldr     r1,=((AT91_PMC_PLLR_DIV(CYGNUM_HAL_ARM_AT91_PLL_DIVIDER))|(AT91_PMC_PLLR_PLLCOUNT(16))|(AT91_PMC_PLLR_MUL(CYGNUM_HAL_ARM_AT91_PLL_MULTIPLIER-1)))
         str     r1,[r0,#AT91_PMC_PLLR]
 
         // Wait for PLL locked indication