diff --git a/arch/arm/src/cxd56xx/cxd56_idle.c b/arch/arm/src/cxd56xx/cxd56_idle.c
index 0a8c93dd6c6..41f21f7a2af 100644
--- a/arch/arm/src/cxd56xx/cxd56_idle.c
+++ b/arch/arm/src/cxd56xx/cxd56_idle.c
@@ -41,9 +41,9 @@
  * IDLE state?
  */
 
-#if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
-#  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_autoled_off(LED_IDLE)
+#ifdef CONFIG_ARCH_LEDS_CPU_ACTIVITY
+#  define BEGIN_IDLE() board_autoled_off(LED_CPU)
+#  define END_IDLE()
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c
index 4825f74c3ce..4d0e98562bb 100644
--- a/arch/arm/src/cxd56xx/cxd56_irq.c
+++ b/arch/arm/src/cxd56xx/cxd56_irq.c
@@ -27,9 +27,11 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include <nuttx/board.h>
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 #include <arch/irq.h>
+#include <arch/board/board.h>
 
 #include "chip.h"
 #include "nvic.h"
@@ -564,6 +566,10 @@ void up_enable_irq(int irq)
 
 void arm_ack_irq(int irq)
 {
+#ifdef CONFIG_ARCH_LEDS_CPU_ACTIVITY
+  board_autoled_on(LED_CPU);
+#endif
+
   /* Check for external interrupt */
 
   if (irq >= CXD56_IRQ_EXTINT)