diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-02 02:23:11 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-10-02 02:23:11 +0000 |
| commit | 0fcfc7b1a0f67eda8bdaade6e215030f439397bf (patch) | |
| tree | 8ab82f7c09652c543bb1e1f8013398950cbec52b /nuttx/arch/arm/src/stm32/stm32_lowputc.c | |
| parent | be9f4d364aeee6344568f4806567fcca1169c068 (diff) | |
| download | px4-nuttx-0fcfc7b1a0f67eda8bdaade6e215030f439397bf.tar.gz px4-nuttx-0fcfc7b1a0f67eda8bdaade6e215030f439397bf.tar.bz2 px4-nuttx-0fcfc7b1a0f67eda8bdaade6e215030f439397bf.zip | |
Add SPI2 setup
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2114 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32/stm32_lowputc.c')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_lowputc.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_lowputc.c b/nuttx/arch/arm/src/stm32/stm32_lowputc.c index dcaeb559d..b3c54d1b3 100644 --- a/nuttx/arch/arm/src/stm32/stm32_lowputc.c +++ b/nuttx/arch/arm/src/stm32/stm32_lowputc.c @@ -220,7 +220,6 @@ void up_lowputc(char ch) void stm32_lowsetup(void) { #if defined(CONFIG_STM32_USART1) || defined(CONFIG_STM32_USART2) || defined(CONFIG_STM32_USART3) - uint32 enr; uint32 mapr; #if defined(HAVE_CONSOLE) && !defined(CONFIG_SUPPRESS_USART_CONFIG) uint32 cr; @@ -229,6 +228,8 @@ void stm32_lowsetup(void) /* Enable the selected USARTs and configure GPIO pins need byed the * the selected USARTs. NOTE: The serial driver later depends on * this pin configuration -- whether or not a serial console is selected. + * + * NOTE: Clocking for USART1, USART2, and/or USART3 was already provided in stm32_rcc.c */ mapr = getreg32(STM32_AFIO_MAPR); @@ -256,18 +257,8 @@ void stm32_lowsetup(void) stm32_configgpio(GPIO_USART1_TX); stm32_configgpio(GPIO_USART1_RX); #endif - - /* Enable USART1 clocking */ - - enr = getreg32(STM32_RCC_APB2ENR); - enr |= RCC_APB2ENR_USART1EN; - putreg32(enr, STM32_RCC_APB2ENR); - #endif /* CONFIG_STM32_USART1 */ -#if defined(CONFIG_STM32_USART2) || defined(CONFIG_STM32_USART3) - enr = getreg32(STM32_RCC_APB1ENR); - #ifdef CONFIG_STM32_USART2 /* Assume default pin mapping: * @@ -294,12 +285,6 @@ void stm32_lowsetup(void) stm32_configgpio(GPIO_USART2_TX); stm32_configgpio(GPIO_USART2_RX); #endif - - /* Enable USART2 clocking */ - - enr |= RCC_APB1ENR_USART2EN; - putreg32(enr, STM32_RCC_APB1ENR); - #endif /* CONFIG_STM32_USART2 */ #ifdef CONFIG_STM32_USART3 @@ -334,14 +319,7 @@ void stm32_lowsetup(void) stm32_configgpio(GPIO_USART3_TX); stm32_configgpio(GPIO_USART3_RX); #endif - - /* Enable USART3 clocking */ - - enr |= RCC_APB1ENR_USART3EN; - putreg32(enr, STM32_RCC_APB1ENR); - #endif /* CONFIG_STM32_USART3 */ -#endif /* CONFIG_STM32_USART2 || CONFIG_STM32_USART3 */ /* Enable and configure the selected console device */ |