diff --git a/include/arch/xtensa/xtensa_rtos.h b/include/arch/xtensa/xtensa_rtos.h
index 16c11ff16e8..015cc17a5f1 100644
--- a/include/arch/xtensa/xtensa_rtos.h
+++ b/include/arch/xtensa/xtensa_rtos.h
@@ -47,7 +47,7 @@
 #endif
 
 #undef  XT_CLOCK_FREQ
-#define XT_CLOCK_FREQ DT_CPU_CLOCK_FREQUENCY
+#define XT_CLOCK_FREQ DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
 
 #ifndef XT_TIMER_INDEX
   #if defined configXT_TIMER_INDEX
diff --git a/include/arch/xtensa/xtensa_timer.h b/include/arch/xtensa/xtensa_timer.h
index 8991ec8665c..a081136d8fa 100644
--- a/include/arch/xtensa/xtensa_timer.h
+++ b/include/arch/xtensa/xtensa_timer.h
@@ -115,7 +115,7 @@
  * anyway!).
  */
 #if defined(XT_SIMULATOR) && !defined(XT_CLOCK_FREQ)
-#define XT_CLOCK_FREQ	DT_CPU_CLOCK_FREQUENCY
+#define XT_CLOCK_FREQ	DT_PROP(DT_PATH(cpus, cpu_0), clock_frequency)
 #endif
 
 #if !defined(XT_CLOCK_FREQ) && !defined(XT_BOARD)
diff --git a/soc/xtensa/esp32/dts_fixup.h b/soc/xtensa/esp32/dts_fixup.h
deleted file mode 100644
index 11d02ffc4b9..00000000000
--- a/soc/xtensa/esp32/dts_fixup.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2018 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* SoC level DTS fixup file */
-
-#define DT_CPU_CLOCK_FREQUENCY DT_CADENCE_TENSILICA_XTENSA_LX6_0_CLOCK_FREQUENCY
-/* End of SoC Level DTS fixup file */
diff --git a/soc/xtensa/intel_s1000/dts_fixup.h b/soc/xtensa/intel_s1000/dts_fixup.h
index 0ec3f26f781..998d1f5d5a7 100644
--- a/soc/xtensa/intel_s1000/dts_fixup.h
+++ b/soc/xtensa/intel_s1000/dts_fixup.h
@@ -2,8 +2,6 @@
 
 /* SoC level DTS fixup file */
 
-#define DT_CPU_CLOCK_FREQUENCY DT_CADENCE_TENSILICA_XTENSA_LX6_0_CLOCK_FREQUENCY
-
 #define DT_L2_SRAM_BASE				CONFIG_SRAM_BASE_ADDRESS
 #define DT_L2_SRAM_SIZE				CONFIG_SRAM_SIZE * 1024
 
diff --git a/soc/xtensa/sample_controller/dts_fixup.h b/soc/xtensa/sample_controller/dts_fixup.h
deleted file mode 100644
index a38b46b4b20..00000000000
--- a/soc/xtensa/sample_controller/dts_fixup.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2018 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/* SoC level DTS fixup file */
-
-#define DT_CPU_CLOCK_FREQUENCY DT_SAMPLE_CONTROLLER_0_CLOCK_FREQUENCY
-
-/* End of SoC Level DTS fixup file */