3 files changed, 17 insertions, 10 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_allocateheap.c b/nuttx/arch/arm/src/lpc17xx/lpc17_allocateheap.c
index edd5100b3..f316570f5 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_allocateheap.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_allocateheap.c
@@ -300,10 +300,18 @@ void up_addregion(void)
    */
 
 #ifdef LPC17_AHB_HEAPBASE
+#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP)
+
+  /* Yes.. allow user-mode access to the AHB SRAM user heap memory */
+
+   lpc17_mpu_uheap((uintptr_t)LPC17_AHB_HEAPBASE, LPC17_AHB_HEAPSIZE);
+
+#endif
+
+  /* Add the AHB SRAM user heap region. */
 
-  /* Yes... Add the AHB SRAM heap region. */
+   kumm_addregion((FAR void*)LPC17_AHB_HEAPBASE, LPC17_AHB_HEAPSIZE);
 
-   kmm_addregion((FAR void*)LPC17_AHB_HEAPBASE, LPC17_AHB_HEAPSIZE);
 #endif
 }
 #endif
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c
index f52a9a35e..b38061404 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c
@@ -1546,7 +1546,7 @@ static void lpc17_widebus(FAR struct sdio_dev_s *dev, bool wide)
 
 static void lpc17_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
 {
-  uint32_t clock;
+  uint32_t clkcr;
 
   switch (rate)
     {
@@ -1554,39 +1554,39 @@ static void lpc17_clock(FAR struct sdio_dev_s *dev, enum sdio_clock_e rate)
 
       default:
       case CLOCK_SDIO_DISABLED:
-        clock = LPC17_CLCKCR_INIT;
+        clkcr = LPC17_CLCKCR_INIT;
         return;
 
       /* Enable in initial ID mode clocking (<400KHz) */
 
       case CLOCK_IDMODE:
-        clock = (LPC17_CLCKCR_INIT | SDCARD_CLOCK_CLKEN);
+        clkcr = (LPC17_CLCKCR_INIT | SDCARD_CLOCK_CLKEN);
         break;
 
       /* Enable in MMC normal operation clocking */
 
       case CLOCK_MMC_TRANSFER:
-        clock = (SDCARD_CLOCK_MMCXFR | SDCARD_CLOCK_CLKEN);
+        clkcr = (SDCARD_CLOCK_MMCXFR | SDCARD_CLOCK_CLKEN);
         break;
 
       /* SD normal operation clocking (wide 4-bit mode) */
 
       case CLOCK_SD_TRANSFER_4BIT:
 #ifndef CONFIG_SDIO_WIDTH_D1_ONLY
-        clock = (SDCARD_CLOCK_SDWIDEXFR | SDCARD_CLOCK_CLKEN);
+        clkcr = (SDCARD_CLOCK_SDWIDEXFR | SDCARD_CLOCK_CLKEN);
         break;
 #endif
 
       /* SD normal operation clocking (narrow 1-bit mode) */
 
       case CLOCK_SD_TRANSFER_1BIT:
-        clock = (SDCARD_CLOCK_SDXFR | SDCARD_CLOCK_CLKEN);
+        clkcr = (SDCARD_CLOCK_SDXFR | SDCARD_CLOCK_CLKEN);
         break;
     }
 
   /* Set the new clock frequency along with the clock enable/disable bit */
 
-  lpc17_setclock(clock);
+  lpc17_setclock(clkcr);
 }
 
 /****************************************************************************
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h
index 3cb4132b2..66eb68b9b 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.h
@@ -124,4 +124,3 @@ void sdio_wrprotect(FAR struct sdio_dev_s *dev, bool wrprotect);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __ARCH_ARM_SRC_LPC17XX_LPC17_SDCARD_H */
-