diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-25 08:52:50 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-25 08:52:50 -0600 |
| commit | 90a5a90d4538bbb614de94b71abdee54adb95626 (patch) | |
| tree | 34c2ea634cee5ecb96756872bb69105e53d50c8f | |
| parent | c6565605168470d1986d1aeaa190e1756dfc4d9c (diff) | |
| download | nuttx-90a5a90d4538bbb614de94b71abdee54adb95626.tar.gz nuttx-90a5a90d4538bbb614de94b71abdee54adb95626.tar.bz2 nuttx-90a5a90d4538bbb614de94b71abdee54adb95626.zip | |
Nucleo: Remove bogus MPU definitions
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/configs/nucleo-f401re/src/nucleo-f401re.h | 10 | ||||
| -rw-r--r-- | nuttx/configs/nucleo-f401re/src/stm32_spi.c | 16 | ||||
| -rw-r--r-- | nuttx/include/nuttx/spi/spi.h | 3 |
4 files changed, 3 insertions, 28 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 153e6dbad..d4f72e192 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -7246,4 +7246,6 @@ * arch/arm/src/stm32/stm32_sdio.c: The dmaflight method must be conditioned on CONFIG_SDIO_PREFLIGHT. Noted by Pelle Windestam (2014-4-25) + * configs/nucleo-f401re: Removed bogus references to the MPU + (2014-4-25). diff --git a/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h b/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h index 8e4c5d0e0..23e259238 100644 --- a/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h +++ b/nuttx/configs/nucleo-f401re/src/nucleo-f401re.h @@ -69,14 +69,6 @@ # define GPIO_A3 (GPIO_PORTB | GPIO_PIN0 | GPIO_INPUT | GPIO_PULLUP ) #endif -/* External interrupts */ - -#define GPIO_EXTI_MPU_DRDY (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTD|GPIO_PIN15) - -/* Data ready pins off */ - -#define GPIO_EXTI_MPU_DRDY_OFF (GPIO_INPUT|GPIO_PULLDOWN|GPIO_EXTI|GPIO_PORTD|GPIO_PIN15) - /* SPI1 off */ #define GPIO_SPI1_MOSI_OFF (GPIO_INPUT|GPIO_PULLDOWN|GPIO_PORTA|GPIO_PIN7) @@ -91,8 +83,6 @@ (GPIO_INPUT|GPIO_PULLDOWN|GPIO_SPEED_2MHz|GPIO_PORTB|GPIO_PIN5) #define GPIO_SPI_CS_FRAM \ (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTD|GPIO_PIN10) -#define GPIO_SPI_CS_MPU \ - (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_2MHz|GPIO_OUTPUT_SET|GPIO_PORTC|GPIO_PIN2) /* SPI chip selects */ diff --git a/nuttx/configs/nucleo-f401re/src/stm32_spi.c b/nuttx/configs/nucleo-f401re/src/stm32_spi.c index b61c54a24..e290f17d9 100644 --- a/nuttx/configs/nucleo-f401re/src/stm32_spi.c +++ b/nuttx/configs/nucleo-f401re/src/stm32_spi.c @@ -94,12 +94,6 @@ void weak_function stm32_spiinitialize(void) #ifdef CONFIG_STM32_SPI1 stm32_configgpio(GPIO_SPI_CS_WIFI); stm32_configgpio(GPIO_SPI_CS_SD_CARD); - stm32_configgpio(GPIO_SPI_CS_MPU); - - /* De-activate all peripherals, required for some peripheral state machines */ - - stm32_gpiowrite(GPIO_SPI_CS_MPU, 1); - stm32_configgpio(GPIO_EXTI_MPU_DRDY); #endif #ifdef CONFIG_STM32_SPI2 @@ -150,7 +144,6 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele stm32_gpiowrite(GPIO_SPI_CS_WIFI, !selected); stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, true); - stm32_gpiowrite(GPIO_SPI_CS_MPU, true); break; case SPIDEV_MMCSD: @@ -158,15 +151,6 @@ void stm32_spi1select(FAR struct spi_dev_s *dev, enum spi_dev_e devid, bool sele stm32_gpiowrite(GPIO_SPI_CS_WIFI, true); stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, !selected); - stm32_gpiowrite(GPIO_SPI_CS_MPU, true); - break; - - case SPIDEV_EXTDEV: - /* Making sure the other peripherals are not selected */ - - stm32_gpiowrite(GPIO_SPI_CS_WIFI, true); - stm32_gpiowrite(GPIO_SPI_CS_SD_CARD, true); - stm32_gpiowrite(GPIO_SPI_CS_MPU, !selected); break; } } diff --git a/nuttx/include/nuttx/spi/spi.h b/nuttx/include/nuttx/spi/spi.h index 7c9f8833f..ace8799cf 100644 --- a/nuttx/include/nuttx/spi/spi.h +++ b/nuttx/include/nuttx/spi/spi.h @@ -360,8 +360,7 @@ enum spi_dev_e SPIDEV_EXPANDER, /* Select SPI I/O expander device */ SPIDEV_MUX, /* Select SPI multiplexer device */ SPIDEV_AUDIO_DATA, /* Select SPI audio codec device data port */ - SPIDEV_AUDIO_CTRL, /* Select SPI audio codec device control port */ - SPIDEV_EXTDEV /* Select SPI external device */ + SPIDEV_AUDIO_CTRL /* Select SPI audio codec device control port */ }; /* Certain SPI devices may required differnt clocking modes */ |