diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-16 17:20:09 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-01-16 17:20:09 +0000 |
| commit | 4dbb08ffcbfc8645114ecb72c8c2e37c86791aef (patch) | |
| tree | f9c580e289198a01df2b576f30c83aae6588cfd3 /nuttx | |
| parent | 44d017bbaf9aff6d3f7b5dfd2042a71a6414380c (diff) | |
| download | px4-nuttx-4dbb08ffcbfc8645114ecb72c8c2e37c86791aef.tar.gz px4-nuttx-4dbb08ffcbfc8645114ecb72c8c2e37c86791aef.tar.bz2 px4-nuttx-4dbb08ffcbfc8645114ecb72c8c2e37c86791aef.zip | |
Fix STM32 F4 APB2 clock input frequencies
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4303 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rwxr-xr-x | nuttx/configs/stm3240g-eval/include/board.h | 8 | ||||
| -rwxr-xr-x | nuttx/configs/stm32f4discovery/include/board.h | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index c74f78a12..1aa2faedc 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2370,3 +2370,5 @@ * arch/arm/src/stm32/stm32_pwm.c: Pulse count was limited to 128; now is (essentially) unlimited. + * configs/stm3240g-eval/include/board.h: Input frequences wrong for all but + one APB2 timer. diff --git a/nuttx/configs/stm3240g-eval/include/board.h b/nuttx/configs/stm3240g-eval/include/board.h index bc11866f3..3096396af 100755 --- a/nuttx/configs/stm3240g-eval/include/board.h +++ b/nuttx/configs/stm3240g-eval/include/board.h @@ -149,10 +149,10 @@ /* Timers driven from APB2 will be twice PCLK2 */ #define STM32_APB2_TIM1_CLKIN (2*STM32_PCLK2_FREQUENCY) -#define STM32_APB2_TIM8_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB2_TIM9_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB2_TIM10_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK1_FREQUENCY) +#define STM32_APB2_TIM8_CLKIN (2*STM32_PCLK2_FREQUENCY) +#define STM32_APB2_TIM9_CLKIN (2*STM32_PCLK2_FREQUENCY) +#define STM32_APB2_TIM10_CLKIN (2*STM32_PCLK2_FREQUENCY) +#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx * otherwise frequency is 2xAPBx. diff --git a/nuttx/configs/stm32f4discovery/include/board.h b/nuttx/configs/stm32f4discovery/include/board.h index 8a9ce5e67..1ac0b0701 100755 --- a/nuttx/configs/stm32f4discovery/include/board.h +++ b/nuttx/configs/stm32f4discovery/include/board.h @@ -142,10 +142,10 @@ /* Timers driven from APB2 will be twice PCLK2 */ #define STM32_APB2_TIM1_CLKIN (2*STM32_PCLK2_FREQUENCY) -#define STM32_APB2_TIM8_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB2_TIM9_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB2_TIM10_CLKIN (2*STM32_PCLK1_FREQUENCY) -#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK1_FREQUENCY) +#define STM32_APB2_TIM8_CLKIN (2*STM32_PCLK2_FREQUENCY) +#define STM32_APB2_TIM9_CLKIN (2*STM32_PCLK2_FREQUENCY) +#define STM32_APB2_TIM10_CLKIN (2*STM32_PCLK2_FREQUENCY) +#define STM32_APB2_TIM11_CLKIN (2*STM32_PCLK2_FREQUENCY) /* Timer Frequencies, if APBx is set to 1, frequency is same to APBx * otherwise frequency is 2xAPBx. |