From 729b2e19075bd245db931651ab7ae5d09114414a Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 23 Oct 2018 06:22:40 -0600
Subject: [PATCH] arch/arm/src/lpc43xx/Kconfig: Restored dependency on
 EXPERIMENTAL for LPC43_SDMMC.

---
 arch/arm/src/lpc43xx/Kconfig                | 1 +
 arch/arm/src/lpc54xx/lpc54_sdmmc.c          | 6 ++----
 configs/lpcxpresso-lpc54628/include/board.h | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/lpc43xx/Kconfig b/arch/arm/src/lpc43xx/Kconfig
index 71d2e13743..a33e4154be 100644
--- a/arch/arm/src/lpc43xx/Kconfig
+++ b/arch/arm/src/lpc43xx/Kconfig
@@ -256,6 +256,7 @@ config LPC43_SDMMC
 	default n
 	select ARCH_HAVE_SDIO
 	select SDIO_BLOCKSETUP
+	depends on EXPERIMENTAL
 
 config LPC43_SPI
 	bool "SPI"
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index 057037911d..b8ce5cf037 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -2768,7 +2768,6 @@ FAR struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno)
   lpc54_putreg(regval, LPC54_SYSCON_SDIOCLKDIV);
   lpc54_putreg(regval | SYSCON_SDIOCLKDIV_REQFLAG, LPC54_SYSCON_SDIOCLKDIV);
 
-#if 1 /* REVISIT */
   /* Set delay values on the sample and drive inputs and outputs using the
    * SDIOCLKCTRL register in the SYSCON block.
    */
@@ -2778,7 +2777,6 @@ FAR struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno)
            SYSCON_SDIOCLKCTRL_DRVDLY_DEFAULT |
            SYSCON_SDIOCLKCTRL_SMPDLY_DEFAULT;
   lpc54_putreg(regval, LPC54_SYSCON_SDIOCLKCTRL);
-#endif
 
   /* Enable clocking to the SD/MMC peripheral */
 
@@ -2820,8 +2818,8 @@ FAR struct sdio_dev_s *lpc54_sdmmc_initialize(int slotno)
 #endif
 
 #ifndef CONFIG_SDIO_WIDTH_D1_ONLY
-  /* REVISIT: Due to a chip errata, DAT4-7 must also be configured.
-   * Otherwise the SD interface will not work.
+  /* REVISIT: Due to chip errata, Rev. 1.7, Issue 3.7, DAT4-7 must also be
+   * configured.  Otherwise the SD interface will not work.
    */
 
   lpc54_gpio_config(GPIO_SD_D4);
diff --git a/configs/lpcxpresso-lpc54628/include/board.h b/configs/lpcxpresso-lpc54628/include/board.h
index 523fe12ab3..68b1cf2ce9 100644
--- a/configs/lpcxpresso-lpc54628/include/board.h
+++ b/configs/lpcxpresso-lpc54628/include/board.h
@@ -203,7 +203,7 @@
  *   Fsdmmc = Fmck / SYSDIV
  *   Fsd    = Fsdmmc / SDDIV
  *
- * The optimal SYSCON divisor (SYSDIV) is the smallest smallest that will
+ * The optimal SYSCON divisor (SYSDIV) is the smallest divisor that will
  * assure that the smallest usable SD frequency (Fmin = 400KHz) can be
  * attained without overflowing the final 8-bit divider (SDDIV).  That is:
  *
@@ -436,8 +436,8 @@
 #define GPIO_SD_POW_EN             GPIO_SD_POW_EN_2         /* P2.5 */
 #define GPIO_SD_WR_PRT             GPIO_SD_WR_PRT_2         /* P2.15 */
 
-/* Due to a chip errata, DAT4-7 must also be configured.  Otherwise the SD
- * interface will not work.
+/* REVISIT: Due to chip errata, Rev. 1.7, Issue 3.7, DAT4-7 must also be
+ * configured.  Otherwise the SD interface will not work.
  */
 
 #define GPIO_SD_D4                 (GPIO_SD_D4_3 | GPIO_PULLUP) /* P4.29 */