diff --git a/boards/posix/native_posix/dts_fixup.h b/boards/posix/native_posix/dts_fixup.h
index 2fe2fed5793..dde425c54d3 100644
--- a/boards/posix/native_posix/dts_fixup.h
+++ b/boards/posix/native_posix/dts_fixup.h
@@ -6,4 +6,3 @@
 
 #define DT_FLASH_DEV_NAME   DT_LABEL(DT_INST(0, zephyr_sim_flash))
 #define DT_UART_0_DEV_NAME  DT_ZEPHYR_NATIVE_POSIX_UART_UART_LABEL
-#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, zephyr_native_posix_rng))
diff --git a/boards/posix/native_posix/native_posix.dts b/boards/posix/native_posix/native_posix.dts
index 95a6aee896b..f67404eb202 100644
--- a/boards/posix/native_posix/native_posix.dts
+++ b/boards/posix/native_posix/native_posix.dts
@@ -16,6 +16,7 @@
 		zephyr,shell-uart = &uart0;
 		zephyr,uart-mcumgr = &uart0;
 		zephyr,flash = &flash0;
+		zephyr,entropy = &rng;
 	};
 
 	aliases {
@@ -85,7 +86,7 @@
 		current-speed = <0>;
 	};
 
-	rng {
+	rng: rng {
 		status = "okay";
 		compatible = "zephyr,native-posix-rng";
 		label = "ENTROPY_0";
diff --git a/boards/posix/nrf52_bsim/dts_fixup.h b/boards/posix/nrf52_bsim/dts_fixup.h
deleted file mode 100644
index b429540fa17..00000000000
--- a/boards/posix/nrf52_bsim/dts_fixup.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Copyright (c) 2020 Nordic Semiconductor ASA */
-/* SPDX-License-Identifier: Apache-2.0 */
-
-/* Board level DTS fixup file */
-
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME	DT_LABEL(DT_INST(0, nordic_nrf_rng))
-#endif
diff --git a/dts/arm/atmel/samd5x.dtsi b/dts/arm/atmel/samd5x.dtsi
index 9cf66cfd6f8..d264a399754 100644
--- a/dts/arm/atmel/samd5x.dtsi
+++ b/dts/arm/atmel/samd5x.dtsi
@@ -49,6 +49,10 @@
 		tc-6 = &tc6;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	soc {
 		sram0: memory@20000000 {
 			compatible = "mmio-sram";
diff --git a/dts/arm/atmel/same70.dtsi b/dts/arm/atmel/same70.dtsi
index 900642567fe..8bc0d04387f 100644
--- a/dts/arm/atmel/same70.dtsi
+++ b/dts/arm/atmel/same70.dtsi
@@ -14,6 +14,10 @@
 		watchdog0 = &wdt;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf51822.dtsi b/dts/arm/nordic/nrf51822.dtsi
index e472f60c08f..cf9d7962671 100644
--- a/dts/arm/nordic/nrf51822.dtsi
+++ b/dts/arm/nordic/nrf51822.dtsi
@@ -6,6 +6,10 @@
 #include "nrf5_common.dtsi"
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf52810.dtsi b/dts/arm/nordic/nrf52810.dtsi
index b04485d1f71..44609e8af6c 100644
--- a/dts/arm/nordic/nrf52810.dtsi
+++ b/dts/arm/nordic/nrf52810.dtsi
@@ -6,6 +6,10 @@
 #include "nrf5_common.dtsi"
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf52811.dtsi b/dts/arm/nordic/nrf52811.dtsi
index 30bf3ac6a51..d8f7692e11a 100644
--- a/dts/arm/nordic/nrf52811.dtsi
+++ b/dts/arm/nordic/nrf52811.dtsi
@@ -9,6 +9,10 @@
 #include "nrf5_common.dtsi"
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf52832.dtsi b/dts/arm/nordic/nrf52832.dtsi
index 4e91cff71c2..0e2fd6c56c7 100644
--- a/dts/arm/nordic/nrf52832.dtsi
+++ b/dts/arm/nordic/nrf52832.dtsi
@@ -6,6 +6,10 @@
 #include "nrf5_common.dtsi"
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf52833.dtsi b/dts/arm/nordic/nrf52833.dtsi
index 0ace66a8a3a..c8341c32753 100644
--- a/dts/arm/nordic/nrf52833.dtsi
+++ b/dts/arm/nordic/nrf52833.dtsi
@@ -10,6 +10,10 @@
 #include "nrf5_common.dtsi"
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf52840.dtsi b/dts/arm/nordic/nrf52840.dtsi
index 50a9132e2a7..bd52a6a63c1 100644
--- a/dts/arm/nordic/nrf52840.dtsi
+++ b/dts/arm/nordic/nrf52840.dtsi
@@ -6,6 +6,10 @@
 #include "nrf5_common.dtsi"
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nordic/nrf5340_cpunet.dtsi b/dts/arm/nordic/nrf5340_cpunet.dtsi
index 6af12a8930f..da2ffd0998b 100644
--- a/dts/arm/nordic/nrf5340_cpunet.dtsi
+++ b/dts/arm/nordic/nrf5340_cpunet.dtsi
@@ -9,6 +9,10 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_k2x.dtsi b/dts/arm/nxp/nxp_k2x.dtsi
index 9d671c8605d..c3fbc9d26fc 100644
--- a/dts/arm/nxp/nxp_k2x.dtsi
+++ b/dts/arm/nxp/nxp_k2x.dtsi
@@ -11,6 +11,9 @@
 #include <dt-bindings/i2c/i2c.h>
 
 / {
+	chosen {
+		zephyr,entropy = &rnga;
+	};
 
 	aliases {
 		adc-0 = &adc0;
diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi
index 978ab2f87ba..3f3910b841a 100644
--- a/dts/arm/nxp/nxp_k6x.dtsi
+++ b/dts/arm/nxp/nxp_k6x.dtsi
@@ -7,7 +7,6 @@
 #include <dt-bindings/i2c/i2c.h>
 
 / {
-
 	aliases {
 		adc-0 = &adc0;
 		adc-1 = &adc1;
@@ -43,6 +42,10 @@
 		watchdog0 = &wdog;
 	};
 
+	chosen {
+		zephyr,entropy = &rnga;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_k8x.dtsi b/dts/arm/nxp/nxp_k8x.dtsi
index c0c32672846..bdf1fe76cd0 100644
--- a/dts/arm/nxp/nxp_k8x.dtsi
+++ b/dts/arm/nxp/nxp_k8x.dtsi
@@ -43,6 +43,10 @@
 		watchdog0 = &wdog;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_kw2xd.dtsi b/dts/arm/nxp/nxp_kw2xd.dtsi
index 7dab73b5194..0c4b0725336 100644
--- a/dts/arm/nxp/nxp_kw2xd.dtsi
+++ b/dts/arm/nxp/nxp_kw2xd.dtsi
@@ -33,6 +33,10 @@
 		watchdog0 = &wdog;
 	};
 
+	chosen {
+		zephyr,entropy = &rnga;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_kw40z.dtsi b/dts/arm/nxp/nxp_kw40z.dtsi
index cd2f0b3839a..ea34b87d50c 100644
--- a/dts/arm/nxp/nxp_kw40z.dtsi
+++ b/dts/arm/nxp/nxp_kw40z.dtsi
@@ -24,6 +24,10 @@
 		uart-0 = &lpuart0;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi
index 10233c6f1b9..eb2e41f8080 100644
--- a/dts/arm/nxp/nxp_kw41z.dtsi
+++ b/dts/arm/nxp/nxp_kw41z.dtsi
@@ -24,6 +24,10 @@
 		uart-0 = &lpuart0;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/nxp/nxp_rt.dtsi b/dts/arm/nxp/nxp_rt.dtsi
index 4cbca822ec8..98febdadc01 100644
--- a/dts/arm/nxp/nxp_rt.dtsi
+++ b/dts/arm/nxp/nxp_rt.dtsi
@@ -37,6 +37,10 @@
 		usbd-2 = &usbd2;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/silabs/efm32_jg_pg_12b.dtsi b/dts/arm/silabs/efm32_jg_pg_12b.dtsi
index 67c00765d6c..03ae86b52db 100644
--- a/dts/arm/silabs/efm32_jg_pg_12b.dtsi
+++ b/dts/arm/silabs/efm32_jg_pg_12b.dtsi
@@ -11,6 +11,10 @@
 #include "gpio_gecko.h"
 
 / {
+	chosen {
+		zephyr,entropy = &trng0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/silabs/efr32mg.dtsi b/dts/arm/silabs/efr32mg.dtsi
index ca252279aba..0c77fe2b753 100644
--- a/dts/arm/silabs/efr32mg.dtsi
+++ b/dts/arm/silabs/efr32mg.dtsi
@@ -6,6 +6,10 @@
 #include "gpio_gecko.h"
 
 / {
+	chosen {
+		zephyr,entropy = &trng0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/st/f4/stm32f405.dtsi b/dts/arm/st/f4/stm32f405.dtsi
index 925630afb81..55715357409 100644
--- a/dts/arm/st/f4/stm32f405.dtsi
+++ b/dts/arm/st/f4/stm32f405.dtsi
@@ -7,6 +7,10 @@
 #include <st/f4/stm32f401.dtsi>
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	soc {
 		pinctrl: pin-controller@40020000 {
 			reg = <0x40020000 0x2400>;
diff --git a/dts/arm/st/f4/stm32f412.dtsi b/dts/arm/st/f4/stm32f412.dtsi
index 27ff3068aaf..6d25bbd73ca 100644
--- a/dts/arm/st/f4/stm32f412.dtsi
+++ b/dts/arm/st/f4/stm32f412.dtsi
@@ -7,6 +7,10 @@
 #include <st/f4/stm32f411.dtsi>
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	soc {
 		pinctrl: pin-controller@40020000 {
 			reg = <0x40020000 0x1c00>;
diff --git a/dts/arm/st/f7/stm32f7.dtsi b/dts/arm/st/f7/stm32f7.dtsi
index 28acfcf31cf..774b0b3d31b 100644
--- a/dts/arm/st/f7/stm32f7.dtsi
+++ b/dts/arm/st/f7/stm32f7.dtsi
@@ -11,6 +11,10 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/st/g4/stm32g4.dtsi b/dts/arm/st/g4/stm32g4.dtsi
index d5bcf1eea41..6e7fecbe243 100644
--- a/dts/arm/st/g4/stm32g4.dtsi
+++ b/dts/arm/st/g4/stm32g4.dtsi
@@ -11,6 +11,10 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/st/l4/stm32l4.dtsi b/dts/arm/st/l4/stm32l4.dtsi
index 0cdd376a59c..f7362ed16f0 100644
--- a/dts/arm/st/l4/stm32l4.dtsi
+++ b/dts/arm/st/l4/stm32l4.dtsi
@@ -12,6 +12,10 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	chosen {
+		zephyr,entropy = &rng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/arm/ti/cc13x2_cc26x2.dtsi b/dts/arm/ti/cc13x2_cc26x2.dtsi
index e89312eac54..e09f9b7db45 100644
--- a/dts/arm/ti/cc13x2_cc26x2.dtsi
+++ b/dts/arm/ti/cc13x2_cc26x2.dtsi
@@ -9,6 +9,10 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/riscv/riscv32-litex-vexriscv.dtsi b/dts/riscv/riscv32-litex-vexriscv.dtsi
index 5d05f0b58d1..e6d259fa724 100644
--- a/dts/riscv/riscv32-litex-vexriscv.dtsi
+++ b/dts/riscv/riscv32-litex-vexriscv.dtsi
@@ -9,6 +9,12 @@
 	#size-cells = <1>;
 	compatible = "litex,vexriscv", "litex-dev";
 	model = "litex,vexriscv";
+
+
+	chosen {
+		zephyr,entropy = &prbs0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/riscv/rv32m1.dtsi b/dts/riscv/rv32m1.dtsi
index b373d5029ef..34a1e1f96d1 100644
--- a/dts/riscv/rv32m1.dtsi
+++ b/dts/riscv/rv32m1.dtsi
@@ -42,6 +42,10 @@
 		pwm-3 = &tpm3;
 	};
 
+	chosen {
+		zephyr,entropy = &trng;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/dts/xtensa/espressif/esp32.dtsi b/dts/xtensa/espressif/esp32.dtsi
index 5c3191d9cae..1d7b75fc468 100644
--- a/dts/xtensa/espressif/esp32.dtsi
+++ b/dts/xtensa/espressif/esp32.dtsi
@@ -8,6 +8,10 @@
 #include <dt-bindings/i2c/i2c.h>
 
 / {
+	chosen {
+		zephyr,entropy = &trng0;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
diff --git a/kernel/init.c b/kernel/init.c
index a08f4383f43..e5877d7c7e2 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -388,7 +388,7 @@ void z_early_boot_rand_get(u8_t *buf, size_t length)
 {
 	int n = sizeof(u32_t);
 #ifdef CONFIG_ENTROPY_HAS_DRIVER
-	struct device *entropy = device_get_binding(CONFIG_ENTROPY_NAME);
+	struct device *entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	int rc;
 
 	if (entropy == NULL) {
diff --git a/samples/drivers/entropy/src/main.c b/samples/drivers/entropy/src/main.c
index 545bfea0b3b..b74e5ef373b 100644
--- a/samples/drivers/entropy/src/main.c
+++ b/samples/drivers/entropy/src/main.c
@@ -14,7 +14,7 @@ void main(void)
 
 	printf("Entropy Example! %s\n", CONFIG_ARCH);
 
-	dev = device_get_binding(CONFIG_ENTROPY_NAME);
+	dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	if (!dev) {
 		printf("error: no entropy device\n");
 		return;
diff --git a/soc/arm/atmel_sam/same70/dts_fixup.h b/soc/arm/atmel_sam/same70/dts_fixup.h
index 0a5dd771041..6099e20fa3d 100644
--- a/soc/arm/atmel_sam/same70/dts_fixup.h
+++ b/soc/arm/atmel_sam/same70/dts_fixup.h
@@ -124,8 +124,6 @@
 #define DT_USBHS_PERIPHERAL_ID	DT_ATMEL_SAM_USBHS_40038000_PERIPHERAL_ID
 #define DT_USBHS_RAM_BASE_ADDRESS	DT_ATMEL_SAM_USBHS_40038000_RAM_0
 
-#define CONFIG_ENTROPY_NAME			DT_ATMEL_SAM_TRNG_40070000_LABEL
-
 #define DT_FLASH_DEV_BASE_ADDRESS		DT_ATMEL_SAM_FLASH_CONTROLLER_400E0C00_BASE_ADDRESS
 #define DT_FLASH_DEV_NAME			DT_ATMEL_SAM_FLASH_CONTROLLER_400E0C00_LABEL
 
diff --git a/soc/arm/atmel_sam/samv71/dts_fixup.h b/soc/arm/atmel_sam/samv71/dts_fixup.h
index 2bedb6bc18e..7396b93f30e 100644
--- a/soc/arm/atmel_sam/samv71/dts_fixup.h
+++ b/soc/arm/atmel_sam/samv71/dts_fixup.h
@@ -129,8 +129,6 @@
 #define DT_USBHS_PERIPHERAL_ID               DT_ATMEL_SAM_USBHS_40038000_PERIPHERAL_ID
 #define DT_USBHS_RAM_BASE_ADDRESS            DT_ATMEL_SAM_USBHS_40038000_RAM_0
 
-#define CONFIG_ENTROPY_NAME                  DT_ATMEL_SAM_TRNG_40070000_LABEL
-
 #define DT_FLASH_DEV_BASE_ADDRESS            DT_ATMEL_SAM_FLASH_CONTROLLER_400E0C00_BASE_ADDRESS
 #define DT_FLASH_DEV_NAME                    DT_ATMEL_SAM_FLASH_CONTROLLER_400E0C00_LABEL
 
diff --git a/soc/arm/nordic_nrf/nrf51/dts_fixup.h b/soc/arm/nordic_nrf/nrf51/dts_fixup.h
index 197715d7c91..45de84e5a99 100644
--- a/soc/arm/nordic_nrf/nrf51/dts_fixup.h
+++ b/soc/arm/nordic_nrf/nrf51/dts_fixup.h
@@ -2,10 +2,6 @@
 
 /* SoC level DTS fixup file */
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, nordic_nrf_rng))
-#endif
-
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
 #define DT_ADC_0_NAME			DT_NORDIC_NRF_ADC_ADC_0_LABEL
diff --git a/soc/arm/nordic_nrf/nrf52/dts_fixup.h b/soc/arm/nordic_nrf/nrf52/dts_fixup.h
index cc21e1f0aa0..c9cdbac66e2 100644
--- a/soc/arm/nordic_nrf/nrf52/dts_fixup.h
+++ b/soc/arm/nordic_nrf/nrf52/dts_fixup.h
@@ -2,10 +2,6 @@
 
 /* SoC level DTS fixup file */
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, nordic_nrf_rng))
-#endif
-
 #define DT_NUM_IRQ_PRIO_BITS	DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
 #define DT_ADC_0_NAME			DT_NORDIC_NRF_SAADC_ADC_0_LABEL
diff --git a/soc/arm/nordic_nrf/nrf53/dts_fixup.h b/soc/arm/nordic_nrf/nrf53/dts_fixup.h
index 7d35c93bfce..cdcbd7b3432 100644
--- a/soc/arm/nordic_nrf/nrf53/dts_fixup.h
+++ b/soc/arm/nordic_nrf/nrf53/dts_fixup.h
@@ -6,10 +6,6 @@
 
 /* SoC level DTS fixup file */
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, nordic_nrf_rng))
-#endif
-
 #define DT_NUM_IRQ_PRIO_BITS \
 	DT_ARM_V8M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
 
diff --git a/soc/arm/nxp_imx/rt/dts_fixup.h b/soc/arm/nxp_imx/rt/dts_fixup.h
index 39da5404499..1972552933d 100644
--- a/soc/arm/nxp_imx/rt/dts_fixup.h
+++ b/soc/arm/nxp_imx/rt/dts_fixup.h
@@ -25,8 +25,6 @@
 #define DT_IRQ_ETH1_COMMON			DT_NXP_KINETIS_ETHERNET_402D4000_IRQ_0
 #define DT_IRQ_ETH1_IEEE1588_TMR		DT_NXP_KINETIS_PTP_402D4000_PTP_IRQ_0
 
-#define CONFIG_ENTROPY_NAME			DT_NXP_KINETIS_TRNG_400CC000_LABEL
-
 #define DT_USBD_MCUX_EHCI_NAME        DT_NXP_KINETIS_USBD_402E0000_LABEL
 #define DT_USBD_MCUX_EHCI_IRQ         DT_NXP_KINETIS_USBD_402E0000_IRQ_USB_OTG
 #define DT_USBD_MCUX_EHCI_IRQ_PRI     DT_NXP_KINETIS_USBD_402E0000_IRQ_0_PRIORITY
diff --git a/soc/arm/nxp_kinetis/k2x/dts_fixup.h b/soc/arm/nxp_kinetis/k2x/dts_fixup.h
index 4cd14774cf8..3f49606d4ba 100644
--- a/soc/arm/nxp_kinetis/k2x/dts_fixup.h
+++ b/soc/arm/nxp_kinetis/k2x/dts_fixup.h
@@ -21,10 +21,4 @@
 #define DT_USBD_KINETIS_BASE_ADDRESS	DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS
 #define DT_USBD_KINETIS_NUM_BIDIR_EP	DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS
 
-#define DT_ENTROPY_MCUX_RNGA_BASE_ADDRESS	DT_NXP_KINETIS_RNGA_40029000_BASE_ADDRESS
-#define DT_ENTROPY_MCUX_RNGA_IRQ		DT_NXP_KINETIS_RNGA_40029000_IRQ_0
-#define DT_ENTROPY_MCUX_RNGA_IRQ_PRI	DT_NXP_KINETIS_RNGA_40029000_IRQ_0_PRIORITY
-#define DT_ENTROPY_MCUX_RNGA_NAME		DT_NXP_KINETIS_RNGA_40029000_LABEL
-#define CONFIG_ENTROPY_NAME			DT_NXP_KINETIS_RNGA_40029000_LABEL
-
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h
index 615fb425e59..1aa5ec0cf51 100644
--- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h
+++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h
@@ -35,12 +35,6 @@
 #define DT_IRQ_ETH_ERR_MISC		DT_NXP_KINETIS_ETHERNET_400C0004_IRQ_ERR_MISC
 #define DT_ETH_MCUX_0_IRQ_PRI		DT_NXP_KINETIS_ETHERNET_400C0004_IRQ_RX_PRIORITY
 
-#define DT_ENTROPY_MCUX_RNGA_BASE_ADDRESS	DT_NXP_KINETIS_RNGA_40029000_BASE_ADDRESS
-#define DT_ENTROPY_MCUX_RNGA_IRQ		DT_NXP_KINETIS_RNGA_40029000_IRQ_0
-#define DT_ENTROPY_MCUX_RNGA_IRQ_PRI	DT_NXP_KINETIS_RNGA_40029000_IRQ_0_PRIORITY
-#define DT_ENTROPY_MCUX_RNGA_NAME		DT_NXP_KINETIS_RNGA_40029000_LABEL
-#define CONFIG_ENTROPY_NAME			DT_NXP_KINETIS_RNGA_40029000_LABEL
-
 #define DT_CAN_0_NAME			DT_NXP_KINETIS_FLEXCAN_40024000_LABEL
 
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h
index 327bcdcb878..2750133d20b 100644
--- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h
+++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h
@@ -15,8 +15,6 @@
 #define DT_ADC_0_IRQ_PRI		DT_NXP_KINETIS_ADC16_4003B000_IRQ_0_PRIORITY
 #define DT_ADC_0_NAME			DT_NXP_KINETIS_ADC16_4003B000_LABEL
 
-#define CONFIG_ENTROPY_NAME			DT_NXP_KINETIS_TRNG_400A0000_LABEL
-
 #define DT_RTC_0_NAME			DT_LABEL(DT_INST(0, nxp_kinetis_rtc))
 
 #define DT_USBD_KINETIS_NAME		DT_NXP_KINETIS_USBD_40072000_LABEL
diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h
index 4cb9b3ed6c7..d678d1a94fe 100644
--- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h
+++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h
@@ -21,11 +21,6 @@
 #define DT_USBD_KINETIS_BASE_ADDRESS	DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS
 #define DT_USBD_KINETIS_NUM_BIDIR_EP	DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS
 
-#define DT_ENTROPY_MCUX_RNGA_BASE_ADDRESS	DT_NXP_KINETIS_RNGA_40029000_BASE_ADDRESS
-#define DT_ENTROPY_MCUX_RNGA_IRQ		DT_NXP_KINETIS_RNGA_40029000_IRQ_0
-#define DT_ENTROPY_MCUX_RNGA_IRQ_PRI	DT_NXP_KINETIS_RNGA_40029000_IRQ_0_PRIORITY
-#define DT_ENTROPY_MCUX_RNGA_NAME		DT_NXP_KINETIS_RNGA_40029000_LABEL
-#define CONFIG_ENTROPY_NAME			DT_NXP_KINETIS_RNGA_40029000_LABEL
 #endif /* CONFIG_SOC_MKW22D5 || CONFIG_SOC_MKW24D5 */
 
 #if defined(CONFIG_SOC_MKW40Z4) || defined(CONFIG_SOC_MKW41Z4)
@@ -34,7 +29,5 @@
 #define DT_FLASH_DEV_BASE_ADDRESS		DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS
 #define DT_FLASH_DEV_NAME			DT_NXP_KINETIS_FTFA_40020000_LABEL
 
-#define CONFIG_ENTROPY_NAME			DT_NXP_KINETIS_TRNG_40029000_LABEL
-
 #endif /* CONFIG_SOC_MKW40Z4 || CONFIG_SOC_MKW41Z4 */
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h b/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h
index 00cf7a3bf3f..c0363d816a1 100644
--- a/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h
+++ b/soc/arm/silabs_exx32/efm32jg12b/dts_fixup.h
@@ -16,6 +16,5 @@
 
 #define DT_WDT_0_NAME			DT_LABEL(DT_INST(0, silabs_gecko_wdog))
 #define DT_WDT_1_NAME			DT_LABEL(DT_INST(1, silabs_gecko_wdog))
-#define CONFIG_ENTROPY_NAME		DT_SILABS_GECKO_TRNG_4001D000_LABEL
 
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h b/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h
index 01d7f88d22d..ed0b45ba77a 100644
--- a/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h
+++ b/soc/arm/silabs_exx32/efm32pg12b/dts_fixup.h
@@ -16,6 +16,5 @@
 
 #define DT_WDT_0_NAME			DT_LABEL(DT_INST(0, silabs_gecko_wdog))
 #define DT_WDT_1_NAME			DT_LABEL(DT_INST(1, silabs_gecko_wdog))
-#define CONFIG_ENTROPY_NAME		DT_SILABS_GECKO_TRNG_4001D000_LABEL
 
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h b/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h
index 616e52c4177..59e3531b176 100644
--- a/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h
+++ b/soc/arm/silabs_exx32/efr32mg12p/dts_fixup.h
@@ -18,6 +18,5 @@
 
 #define DT_WDT_0_NAME			DT_LABEL(DT_INST(0, silabs_gecko_wdog))
 #define DT_WDT_1_NAME			DT_LABEL(DT_INST(1, silabs_gecko_wdog))
-#define CONFIG_ENTROPY_NAME		DT_SILABS_GECKO_TRNG_4001D000_LABEL
 
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h
index 259fd55f9c5..6f5c8e52465 100644
--- a/soc/arm/st_stm32/stm32f4/dts_fixup.h
+++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h
@@ -207,8 +207,4 @@
 
 #define DT_FLASH_DEV_NAME		DT_LABEL(DT_INST(0, st_stm32f4_flash_controller))
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, st_stm32_rng))
-#endif
-
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h
index b5c3f097aa5..8ad2dcdfa59 100644
--- a/soc/arm/st_stm32/stm32f7/dts_fixup.h
+++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h
@@ -65,8 +65,4 @@
 
 #define DT_ADC_1_NAME			DT_ST_STM32_ADC_40012000_LABEL
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, st_stm32_rng))
-#endif
-
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/st_stm32/stm32g4/dts_fixup.h b/soc/arm/st_stm32/stm32g4/dts_fixup.h
index 51708c63c50..dfc81dcf7d8 100644
--- a/soc/arm/st_stm32/stm32g4/dts_fixup.h
+++ b/soc/arm/st_stm32/stm32g4/dts_fixup.h
@@ -41,8 +41,4 @@
 
 #define DT_WDT_0_NAME				DT_LABEL(DT_INST(0, st_stm32_watchdog))
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, st_stm32_rng))
-#endif
-
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h
index d2015fc5f11..a3dd0ee1d73 100644
--- a/soc/arm/st_stm32/stm32l4/dts_fixup.h
+++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h
@@ -70,8 +70,4 @@
 #define DT_LPTIM_1_CLOCK_BITS	DT_ST_STM32_TIMERS_40007C00_CLOCK_BITS_0
 #define DT_LPTIM_1_CLOCK_BUS	DT_ST_STM32_TIMERS_40007C00_CLOCK_BUS_0
 
-#ifndef CONFIG_ENTROPY_NAME
-#define CONFIG_ENTROPY_NAME		DT_LABEL(DT_INST(0, st_stm32_rng))
-#endif
-
 /* End of SoC Level DTS fixup file */
diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h b/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h
index 8e09720f666..3fd273d5ab2 100644
--- a/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h
+++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h
@@ -7,7 +7,6 @@
 /* SoC level DTS fixup file */
 
 #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS
-#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, ti_cc13xx_cc26xx_trng))
 
 #define DT_CPU_CLOCK_FREQUENCY DT_ARM_CORTEX_M4_0_CLOCK_FREQUENCY
 
diff --git a/soc/riscv/openisa_rv32m1/dts_fixup.h b/soc/riscv/openisa_rv32m1/dts_fixup.h
index 70296784c6e..fd3efcb7f30 100644
--- a/soc/riscv/openisa_rv32m1/dts_fixup.h
+++ b/soc/riscv/openisa_rv32m1/dts_fixup.h
@@ -11,7 +11,6 @@
 #define DT_FLASH_DEV_BASE_ADDRESS DT_OPENISA_RV32M1_FTFE_40023000_BASE_ADDRESS
 #define DT_FLASH_DEV_NAME         DT_OPENISA_RV32M1_FTFE_40023000_LABEL
 #define DT_START_UP_ENTRY_OFFSET  0x80
-#define CONFIG_ENTROPY_NAME       DT_LABEL(DT_INST(0, openisa_rv32m1_trng))
 
 #endif /* CONFIG_SOC_OPENISA_RV32M1_RISCV32 */
 
diff --git a/soc/xtensa/esp32/dts_fixup.h b/soc/xtensa/esp32/dts_fixup.h
index cc268060dc4..6a2b1f42835 100644
--- a/soc/xtensa/esp32/dts_fixup.h
+++ b/soc/xtensa/esp32/dts_fixup.h
@@ -7,6 +7,5 @@
 /* SoC level DTS fixup file */
 
 #define DT_CPU_CLOCK_FREQUENCY DT_CADENCE_TENSILICA_XTENSA_LX6_0_CLOCK_FREQUENCY
-#define CONFIG_ENTROPY_NAME DT_LABEL(DT_INST(0, espressif_esp32_trng))
 #define DT_WDT_0_NAME DT_LABEL(DT_INST(0, espressif_esp32_watchdog))
 /* End of SoC Level DTS fixup file */
diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c
index 6db624b3cdd..5360d716a10 100644
--- a/subsys/bluetooth/controller/ll_sw/ll.c
+++ b/subsys/bluetooth/controller/ll_sw/ll.c
@@ -132,7 +132,7 @@ int ll_init(struct k_sem *sem_rx)
 
 	clock_control_on(clk, CLOCK_CONTROL_NRF_SUBSYS_LF);
 
-	entropy = device_get_binding(CONFIG_ENTROPY_NAME);
+	entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	if (!entropy) {
 		return -ENODEV;
 	}
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index 1e68e999097..75463a55759 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -606,7 +606,7 @@ int ull_conn_init(void)
 {
 	int err;
 
-	entropy = device_get_binding(CONFIG_ENTROPY_NAME);
+	entropy = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	if (!entropy) {
 		return -ENODEV;
 	}
diff --git a/subsys/bluetooth/controller/util/util.c b/subsys/bluetooth/controller/util/util.c
index 9f9f76fae6b..e3a50e3288f 100644
--- a/subsys/bluetooth/controller/util/util.c
+++ b/subsys/bluetooth/controller/util/util.c
@@ -46,11 +46,11 @@ int util_rand(void *buf, size_t len)
 		/* Only one entropy device exists, so this is safe even
 		 * if the whole operation isn't atomic.
 		 */
-		dev = device_get_binding(CONFIG_ENTROPY_NAME);
+		dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		__ASSERT((dev != NULL),
-			"Device driver for %s (CONFIG_ENTROPY_NAME) not found. "
+			"Device driver for %s (DT_CHOSEN_ZEPHYR_ENTROPY_LABEL) not found. "
 			"Check your build configuration!",
-			CONFIG_ENTROPY_NAME);
+			DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	}
 
 	return entropy_get_entropy(dev, (u8_t *)buf, len);
diff --git a/subsys/net/lib/openthread/platform/entropy.c b/subsys/net/lib/openthread/platform/entropy.c
index 7e3ce6bced3..35a3d37bacb 100644
--- a/subsys/net/lib/openthread/platform/entropy.c
+++ b/subsys/net/lib/openthread/platform/entropy.c
@@ -30,7 +30,7 @@ otError otPlatEntropyGet(uint8_t *aOutput, uint16_t aOutputLength)
 	}
 
 	if (dev == NULL) {
-		dev = device_get_binding(CONFIG_ENTROPY_NAME);
+		dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		if (dev == NULL) {
 			LOG_ERR("Failed to obtain entropy device");
 			return OT_ERROR_FAILED;
diff --git a/subsys/net/lib/sockets/sockets_tls.c b/subsys/net/lib/sockets/sockets_tls.c
index 292873beb0f..ecb5d21d719 100644
--- a/subsys/net/lib/sockets/sockets_tls.c
+++ b/subsys/net/lib/sockets/sockets_tls.c
@@ -260,7 +260,7 @@ static int tls_init(struct device *unused)
 	struct device *dev = NULL;
 
 #if defined(CONFIG_ENTROPY_HAS_DRIVER)
-	dev = device_get_binding(CONFIG_ENTROPY_NAME);
+	dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 
 	if (!dev) {
 		NET_ERR("Failed to obtain entropy device");
diff --git a/subsys/random/rand32_ctr_drbg.c b/subsys/random/rand32_ctr_drbg.c
index 6efdfe68ea7..67d68270779 100644
--- a/subsys/random/rand32_ctr_drbg.c
+++ b/subsys/random/rand32_ctr_drbg.c
@@ -54,12 +54,12 @@ static int ctr_drbg_initialize(void)
 	/* Only one entropy device exists, so this is safe even
 	 * if the whole operation isn't atomic.
 	 */
-	entropy_driver = device_get_binding(CONFIG_ENTROPY_NAME);
+	entropy_driver = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	if (!entropy_driver) {
 		__ASSERT((entropy_driver != NULL),
-			"Device driver for %s (CONFIG_ENTROPY_NAME) not found. "
+			"Device driver for %s (DT_CHOSEN_ZEPHYR_ENTROPY_LABEL) not found. "
 			"Check your build configuration!",
-			CONFIG_ENTROPY_NAME);
+			DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		return -EINVAL;
 	}
 
diff --git a/subsys/random/rand32_entropy_device.c b/subsys/random/rand32_entropy_device.c
index ae1241c04c0..3f1b531c9d5 100644
--- a/subsys/random/rand32_entropy_device.c
+++ b/subsys/random/rand32_entropy_device.c
@@ -22,11 +22,11 @@ u32_t sys_rand32_get(void)
 		/* Only one entropy device exists, so this is safe even
 		 * if the whole operation isn't atomic.
 		 */
-		dev = device_get_binding(CONFIG_ENTROPY_NAME);
+		dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		__ASSERT((dev != NULL),
-			"Device driver for %s (CONFIG_ENTROPY_NAME) not found. "
+			"Device driver for %s (DT_CHOSEN_ZEPHYR_ENTROPY_LABEL) not found. "
 			"Check your build configuration!",
-			CONFIG_ENTROPY_NAME);
+			DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		entropy_driver = dev;
 	}
 
@@ -56,11 +56,11 @@ static int rand_get(u8_t *dst, size_t outlen, bool csrand)
 		/* Only one entropy device exists, so this is safe even
 		 * if the whole operation isn't atomic.
 		 */
-		dev = device_get_binding(CONFIG_ENTROPY_NAME);
+		dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		__ASSERT((dev != NULL),
-			"Device driver for %s (CONFIG_ENTROPY_NAME) not found. "
+			"Device driver for %s (DT_CHOSEN_ZEPHYR_ENTROPY_LABEL) not found. "
 			"Check your build configuration!",
-			CONFIG_ENTROPY_NAME);
+			DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 		entropy_driver = dev;
 	}
 
diff --git a/subsys/random/rand32_xoroshiro128.c b/subsys/random/rand32_xoroshiro128.c
index 8fc8b6525c2..32506d4c124 100644
--- a/subsys/random/rand32_xoroshiro128.c
+++ b/subsys/random/rand32_xoroshiro128.c
@@ -52,7 +52,7 @@ static inline u64_t rotl(const u64_t x, int k)
 
 static int xoroshiro128_initialize(struct device *dev)
 {
-	dev = device_get_binding(CONFIG_ENTROPY_NAME);
+	dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	if (!dev) {
 		return -EINVAL;
 	}
diff --git a/tests/drivers/entropy/api/src/main.c b/tests/drivers/entropy/api/src/main.c
index 69932339dcf..843bc9ba678 100644
--- a/tests/drivers/entropy/api/src/main.c
+++ b/tests/drivers/entropy/api/src/main.c
@@ -71,7 +71,7 @@ static int get_entropy(void)
 	u8_t buffer[BUFFER_LENGTH] = { 0 };
 	int ret;
 
-	dev = device_get_binding(CONFIG_ENTROPY_NAME);
+	dev = device_get_binding(DT_CHOSEN_ZEPHYR_ENTROPY_LABEL);
 	if (!dev) {
 		TC_PRINT("error: no random device\n");
 		return TC_FAIL;