diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-07 13:59:45 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-07 13:59:45 -0600 |
commit | 59f3ab529a8edfb65b9fb25510c104f71c4c2c0b (patch) | |
tree | a82811dce95ec19a32aa49688f5a78c4fe57d212 | |
parent | 75356d82da960f5872b79a2e8a6d026650754e0c (diff) | |
download | nuttx-59f3ab529a8edfb65b9fb25510c104f71c4c2c0b.tar.gz nuttx-59f3ab529a8edfb65b9fb25510c104f71c4c2c0b.tar.bz2 nuttx-59f3ab529a8edfb65b9fb25510c104f71c4c2c0b.zip |
STM32 SPI: The source clock for SPI 4,5, and 6 should be PCLK2, not PCLK1 (for F411, F427, and F429). Per David Sidrane.
-rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_spi.c | 6 | ||||
-rw-r--r-- | nuttx/drivers/serial/lowconsole.c | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_spi.c b/nuttx/arch/arm/src/stm32/stm32_spi.c index 70d7925dd..6cbdff6ec 100644 --- a/nuttx/arch/arm/src/stm32/stm32_spi.c +++ b/nuttx/arch/arm/src/stm32/stm32_spi.c @@ -409,7 +409,7 @@ static struct stm32_spidev_s g_spi4dev = { .spidev = { &g_sp4iops }, .spibase = STM32_SPI4_BASE, - .spiclock = STM32_PCLK1_FREQUENCY, + .spiclock = STM32_PCLK2_FREQUENCY, #ifdef CONFIG_STM32_SPI_INTERRUPTS .spiirq = STM32_IRQ_SPI4, #endif @@ -448,7 +448,7 @@ static struct stm32_spidev_s g_spi5dev = { .spidev = { &g_sp5iops }, .spibase = STM32_SPI5_BASE, - .spiclock = STM32_PCLK1_FREQUENCY, + .spiclock = STM32_PCLK2_FREQUENCY, #ifdef CONFIG_STM32_SPI_INTERRUPTS .spiirq = STM32_IRQ_SPI5, #endif @@ -487,7 +487,7 @@ static struct stm32_spidev_s g_spi6dev = { .spidev = { &g_sp6iops }, .spibase = STM32_SPI6_BASE, - .spiclock = STM32_PCLK1_FREQUENCY, + .spiclock = STM32_PCLK2_FREQUENCY, #ifdef CONFIG_STM32_SPI_INTERRUPTS .spiirq = STM32_IRQ_SPI6, #endif diff --git a/nuttx/drivers/serial/lowconsole.c b/nuttx/drivers/serial/lowconsole.c index 90bfefd20..f1ee3885c 100644 --- a/nuttx/drivers/serial/lowconsole.c +++ b/nuttx/drivers/serial/lowconsole.c @@ -115,6 +115,7 @@ static ssize_t lowconsole_write(struct file *filep, const char *buffer, size_t b { up_putc(*buffer++); } + return ret; } |