diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-03 16:28:53 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-03 16:28:53 +0000 |
commit | 6b02656019eec83657fad94d4e685ff516e471ae (patch) | |
tree | edbb1108d11a9c6a879014312a57bee1e15a2576 /nuttx/configs/stm3210e-eval | |
parent | 0a9e07be6c7ad1d114b55efbde66eb6e9952fc49 (diff) | |
download | px4-nuttx-6b02656019eec83657fad94d4e685ff516e471ae.tar.gz px4-nuttx-6b02656019eec83657fad94d4e685ff516e471ae.tar.bz2 px4-nuttx-6b02656019eec83657fad94d4e685ff516e471ae.zip |
Fix GPIO alternate pin name space issue
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2117 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/stm3210e-eval')
-rwxr-xr-x | nuttx/configs/stm3210e-eval/README.txt | 18 | ||||
-rwxr-xr-x | nuttx/configs/stm3210e-eval/src/up_spi.c | 17 |
2 files changed, 30 insertions, 5 deletions
diff --git a/nuttx/configs/stm3210e-eval/README.txt b/nuttx/configs/stm3210e-eval/README.txt index 146ab5137..d379d6e08 100755 --- a/nuttx/configs/stm3210e-eval/README.txt +++ b/nuttx/configs/stm3210e-eval/README.txt @@ -235,11 +235,25 @@ STM3210E-EVAL-specific Configuration Options Alternate pin mappings (should not be used with the STM3210E-EVAL board): + CONFIG_STM32_TIM1_FULL_REMAP + CONFIG_STM32_TIM1_PARTIAL_REMAP + CONFIG_STM32_TIM2_FULL_REMAP + CONFIG_STM32_TIM2_PARTIAL_REMAP_1 + CONFIG_STM32_TIM2_PARTIAL_REMAP_2 + CONFIG_STM32_TIM3_FULL_REMAP + CONFIG_STM32_TIM3_PARTIAL_REMAP + CONFIG_STM32_TIM4_REMAP CONFIG_STM32_USART1_REMAP CONFIG_STM32_USART2_REMAP - CONFIG_STM32_USART3_PARTIAL_REMAP CONFIG_STM32_USART3_FULL_REMAP - + CONFIG_STM32_USART3_PARTIAL_REMAP + CONFIG_STM32_SPI1_REMAP + CONFIG_STM32_SPI3_REMAP + CONFIG_STM32_I2C1_REMAP + CONFIG_STM32_CAN1_FULL_REMAP + CONFIG_STM32_CAN1_PARTIAL_REMAP + CONFIG_STM32_CAN2_REMAP + STM32F103Z specific device driver settings CONFIG_U[S]ARTn_SERIAL_CONSOLE - selects the USARTn (n=1,2,3) or UART diff --git a/nuttx/configs/stm3210e-eval/src/up_spi.c b/nuttx/configs/stm3210e-eval/src/up_spi.c index 75c27c40d..058d43a29 100755 --- a/nuttx/configs/stm3210e-eval/src/up_spi.c +++ b/nuttx/configs/stm3210e-eval/src/up_spi.c @@ -92,10 +92,20 @@ ************************************************************************************/
void weak_function stm32_spiinitialize(void)
-{
+{ /* NOTE: Clocking for SPI1 and/or SPI2 was already provided in stm32_rcc.c */ #ifdef CONFIG_STM32_SPI1 + /* Select SPI1 pin mapping */ + + uint32 mapr = getreg32(STM32_AFIO_MAPR); +#ifdef CONFIG_STM32_SPI1_REMAP + mapr |= AFIO_MAPR_SPI1_REMAP; +#else + mapr &= ~AFIO_MAPR_SPI1_REMAP; +#endif + putreg32(mapr, STM32_AFIO_MAPR); + /* Configure SPI1 alternate function pins */
stm32_configgpio(GPIO_SPI1_SCK);
@@ -107,12 +117,13 @@ void weak_function stm32_spiinitialize(void) stm32_configgpio(GPIO_MMCSD_CS);
stm32_configgpio(GPIO_FLASH_CS);
#endif + #ifdef CONFIG_STM32_SPI2 /* Configure SPI1 alternate function pins */
stm32_configgpio(GPIO_SPI2_SCK);
- stm32_configgpio(GPIO_SPI3_MISO);
- stm32_configgpio(GPIO_SPI4_MOSI);
+ stm32_configgpio(GPIO_SPI2_MISO);
+ stm32_configgpio(GPIO_SPI2_MOSI);
#endif
}
|