diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 29c06667f55555..a1517f17ed0976 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -50,18 +50,6 @@ config XTENSA_ENABLE_BACKTRACE
 	help
 	  Enable this config option to print backtrace on panic exception
 
-config XTENSA_CPU_IDLE_SPIN
-	bool "Use busy loop for k_cpu_idle"
-	help
-	  Use a spin loop instead of WAITI for the CPU idle state.
-
-config XTENSA_WAITI_BUG
-	bool "Workaround sequence for WAITI bug on LX6"
-	help
-	  SOF traditionally contains this workaround on its ADSP
-	  platforms which prefixes a WAITI entry with 128 NOP
-	  instructions followed by an ISYNC and EXTW.
-
 config XTENSA_SMALL_VECTOR_TABLE_ENTRY
 	bool "Workaround for small vector table entries"
 	help
diff --git a/arch/xtensa/core/cpu_idle.c b/arch/xtensa/core/cpu_idle.c
index fa9384d8445a8e..dae79f023ff7a3 100644
--- a/arch/xtensa/core/cpu_idle.c
+++ b/arch/xtensa/core/cpu_idle.c
@@ -6,48 +6,13 @@
 #include <zephyr/toolchain.h>
 #include <zephyr/tracing/tracing.h>
 
-/* xt-clang removes any NOPs more than 8. So we need to set
- * no optimization to avoid those NOPs from being removed.
- *
- * This function is simply enough and full of hand written
- * assembly that optimization is not really meaningful
- * anyway. So we can skip optimization unconditionally.
- * Re-evalulate its use and add #ifdef if this assumption
- * is no longer valid.
- */
-__no_optimization
+#ifndef CONFIG_ARCH_CPU_IDLE_CUSTOM
 void arch_cpu_idle(void)
 {
 	sys_trace_idle();
-
-	/* Just spin forever with interrupts unmasked, for platforms
-	 * where WAITI can't be used or where its behavior is
-	 * complicated (Intel DSPs will power gate on idle entry under
-	 * some circumstances)
-	 */
-	if (IS_ENABLED(CONFIG_XTENSA_CPU_IDLE_SPIN)) {
-		__asm__ volatile("rsil a0, 0");
-		__asm__ volatile("loop_forever: j loop_forever");
-		return;
-	}
-
-	/* Cribbed from SOF: workaround for a bug in some versions of
-	 * the LX6 IP.  Preprocessor ugliness avoids the need to
-	 * figure out how to get the compiler to unroll a loop.
-	 */
-	if (IS_ENABLED(CONFIG_XTENSA_WAITI_BUG)) {
-#define NOP4 __asm__ volatile("nop; nop; nop; nop");
-#define NOP32 NOP4 NOP4 NOP4 NOP4 NOP4 NOP4 NOP4 NOP4
-#define NOP128() NOP32 NOP32 NOP32 NOP32
-		NOP128();
-#undef NOP128
-#undef NOP32
-#undef NOP4
-		__asm__ volatile("isync; extw");
-	}
-
 	__asm__ volatile ("waiti 0");
 }
+#endif
 
 void arch_cpu_atomic_idle(unsigned int key)
 {
diff --git a/soc/xtensa/intel_adsp/Kconfig b/soc/xtensa/intel_adsp/Kconfig
index f04286ccae12b4..a3d93d976ea1a8 100644
--- a/soc/xtensa/intel_adsp/Kconfig
+++ b/soc/xtensa/intel_adsp/Kconfig
@@ -113,4 +113,16 @@ config ADSP_IMR_CONTEXT_SAVE
 	  entering D3 state. Later this context can be used to FW restore
 	  when Host power up DSP again.
 
+config XTENSA_CPU_IDLE_SPIN
+	bool "Use busy loop for k_cpu_idle"
+	help
+	  Use a spin loop instead of WAITI for the CPU idle state.
+
+config XTENSA_WAITI_BUG
+	bool "Workaround sequence for WAITI bug on LX6"
+	help
+	  SOF traditionally contains this workaround on its ADSP
+	  platforms which prefixes a WAITI entry with 128 NOP
+	  instructions followed by an ISYNC and EXTW.
+
 endif # SOC_FAMILY_INTEL_ADSP