From 983c436f5dd051d34d938096a6cad2c904c2f5ec Mon Sep 17 00:00:00 2001
From: David Sidrane <david_s5@nscdg.com>
Date: Tue, 31 Jan 2017 11:10:21 -1000
Subject: [PATCH] px4fmu-v4pro Refreshed nuttx SDIO changes for 7.19+

---
 nuttx-configs/px4fmu-v4pro/include/board.h | 4 ++--
 nuttx-configs/px4fmu-v4pro/nsh/defconfig   | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nuttx-configs/px4fmu-v4pro/include/board.h b/nuttx-configs/px4fmu-v4pro/include/board.h
index ca506460bd..98ab778597 100644
--- a/nuttx-configs/px4fmu-v4pro/include/board.h
+++ b/nuttx-configs/px4fmu-v4pro/include/board.h
@@ -216,7 +216,7 @@
  * DMA OFF: SDIOCLK=48MHz, SDMMC_CK=SDIOCLK/(2+2)=12 MHz
  */
 
-#ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_STM32_SDIO_DMA
 #  define SDIO_MMCXFR_CLKDIV     (1 << SDIO_CLKCR_CLKDIV_SHIFT)
 #else
 #  define SDIO_MMCXFR_CLKDIV     (2 << SDIO_CLKCR_CLKDIV_SHIFT)
@@ -227,7 +227,7 @@
  */
 //TODO #warning "Check Freq for 24mHz"
 
-#ifdef CONFIG_SDIO_DMA
+#ifdef CONFIG_STM32_SDIO_DMA
 #  define SDIO_SDXFR_CLKDIV      (1 << SDIO_CLKCR_CLKDIV_SHIFT)
 #else
 #  define SDIO_SDXFR_CLKDIV      (2 << SDIO_CLKCR_CLKDIV_SHIFT)
diff --git a/nuttx-configs/px4fmu-v4pro/nsh/defconfig b/nuttx-configs/px4fmu-v4pro/nsh/defconfig
index dad4a0b457..b23d47fca9 100644
--- a/nuttx-configs/px4fmu-v4pro/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v4pro/nsh/defconfig
@@ -151,8 +151,6 @@ CONFIG_ARMV7M_HAVE_STACKCHECK=y
 # CONFIG_ARMV7M_STACKCHECK is not set
 # CONFIG_ARMV7M_ITMSYSLOG is not set
 CONFIG_SERIAL_TERMIOS=y
-CONFIG_SDIO_DMA=y
-# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
 # STM32 Configuration Options
@@ -553,7 +551,9 @@ CONFIG_STM32_I2CTIMEOTICKS=10
 #
 # SDIO Configuration
 #
-CONFIG_SDIO_DMAPRIO=0x00010000
+CONFIG_STM32_SDIO_DMA=y
+CONFIG_STM32_SDIO_DMAPRIO=0x00010000
+# CONFIG_STM32_SDIO_WIDTH_D1_ONLY is not set
 CONFIG_STM32_BBSRAM=y
 CONFIG_STM32_BBSRAM_FILES=5
 CONFIG_STM32_SAVE_CRASHDUMP=y
@@ -876,11 +876,13 @@ CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_HAVECARDDETECT is not set
 # CONFIG_MMCSD_SPI is not set
 CONFIG_ARCH_HAVE_SDIO=y
+CONFIG_SDIO_DMA=y
 CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_SDIO_PREFLIGHT=y
 # CONFIG_SDIO_MUXBUS is not set
 CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y
+# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 # CONFIG_SDIO_BLOCKSETUP is not set
 # CONFIG_MODEM is not set
 CONFIG_MTD=y