diff --git a/boards/arm/mps2_an385/mps2_an385.dts b/boards/arm/mps2_an385/mps2_an385.dts
index 27bd35fed62..2ef8045780e 100644
--- a/boards/arm/mps2_an385/mps2_an385.dts
+++ b/boards/arm/mps2_an385/mps2_an385.dts
@@ -15,6 +15,7 @@
 		led1 = &led_1;
 		sw0 = &user_button_0;
 		sw1 = &user_button_1;
+		watchdog0 = &wdog0;
 	};
 
 	chosen {
@@ -141,6 +142,7 @@
 			compatible = "arm,cmsdk-watchdog";
 			clocks = <&sysclk>;
 			reg = <0x40008000 0x1000>;
+			label = "WATCHDOG";
 		};
 
 		uart4: uart@40009000 {
diff --git a/boards/arm/mps2_an521/mps2_an521-common.dtsi b/boards/arm/mps2_an521/mps2_an521-common.dtsi
index 6d131b49764..d8445918a9d 100644
--- a/boards/arm/mps2_an521/mps2_an521-common.dtsi
+++ b/boards/arm/mps2_an521/mps2_an521-common.dtsi
@@ -81,6 +81,7 @@ wdog0: wdog@81000 {
 	compatible = "arm,cmsdk-watchdog";
 	reg = <0x81000 0x1000>;
 	clocks = <&sysclk>;
+	label = "WATCHDOG";
 };
 
 uart0: uart@200000 {
diff --git a/boards/arm/mps2_an521/mps2_an521.dts b/boards/arm/mps2_an521/mps2_an521.dts
index 294fb42f537..f27f2852fcc 100644
--- a/boards/arm/mps2_an521/mps2_an521.dts
+++ b/boards/arm/mps2_an521/mps2_an521.dts
@@ -19,6 +19,7 @@
 		led1 = &led_1;
 		sw0 = &user_button_0;
 		sw1 = &user_button_1;
+		watchdog0 = &wdog0;
 	};
 
 	chosen {
diff --git a/boards/arm/mps2_an521/mps2_an521_nonsecure.dts b/boards/arm/mps2_an521/mps2_an521_nonsecure.dts
index 0ee238acb78..30ca1f83a16 100644
--- a/boards/arm/mps2_an521/mps2_an521_nonsecure.dts
+++ b/boards/arm/mps2_an521/mps2_an521_nonsecure.dts
@@ -19,6 +19,7 @@
 		led1 = &led_1;
 		sw0 = &user_button_0;
 		sw1 = &user_button_1;
+		watchdog0 = &wdog0;
 	};
 
 	chosen {
diff --git a/boards/arm/v2m_beetle/v2m_beetle.dts b/boards/arm/v2m_beetle/v2m_beetle.dts
index af23275af88..1abc7d905fe 100644
--- a/boards/arm/v2m_beetle/v2m_beetle.dts
+++ b/boards/arm/v2m_beetle/v2m_beetle.dts
@@ -9,6 +9,10 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		watchdog0 = &wdog0;
+	};
+
 	chosen {
 		zephyr,console = &uart1;
 		zephyr,shell-uart = &uart1;
@@ -87,6 +91,7 @@
 			compatible = "arm,cmsdk-watchdog";
 			clocks = <&sysclk>;
 			reg = <0x40008000 0x1000>;
+			label = "WATCHDOG";
 		};
 
 		gpio0: gpio@40010000 {
diff --git a/boards/arm/v2m_musca/v2m_musca-common.dtsi b/boards/arm/v2m_musca/v2m_musca-common.dtsi
index 2f8b3d76296..bfb138d1cba 100644
--- a/boards/arm/v2m_musca/v2m_musca-common.dtsi
+++ b/boards/arm/v2m_musca/v2m_musca-common.dtsi
@@ -43,6 +43,7 @@ wdog0: wdog@81000 {
 	compatible = "arm,cmsdk-watchdog";
 	clocks = <&sysclk>;
 	reg = <0x81000 0x1000>;
+	label = "WATCHDOG";
 };
 
 uart0: uart@101000 {
diff --git a/boards/arm/v2m_musca/v2m_musca.dts b/boards/arm/v2m_musca/v2m_musca.dts
index f2fdbbe4ba5..34ad23e872b 100644
--- a/boards/arm/v2m_musca/v2m_musca.dts
+++ b/boards/arm/v2m_musca/v2m_musca.dts
@@ -17,6 +17,7 @@
 		led0 = &green_led;
 		led1 = &blue_led;
 		led2 = &red_led;
+		watchdog0 = &wdog0;
 	};
 
 	chosen {
diff --git a/boards/arm/v2m_musca/v2m_musca_nonsecure.dts b/boards/arm/v2m_musca/v2m_musca_nonsecure.dts
index 0c99df61743..e94f35f1df7 100644
--- a/boards/arm/v2m_musca/v2m_musca_nonsecure.dts
+++ b/boards/arm/v2m_musca/v2m_musca_nonsecure.dts
@@ -13,6 +13,10 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+		watchdog0 = &wdog0;
+	};
+
 	chosen {
 		zephyr,console = &uart1;
 		zephyr,sram = &sram0;
diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.dts b/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.dts
index 27bab0ebf8f..411fa7051dd 100644
--- a/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.dts
+++ b/boards/arm/v2m_musca_b1/v2m_musca_b1_nonsecure.dts
@@ -13,6 +13,9 @@
 	#address-cells = <1>;
 	#size-cells = <1>;
 
+	aliases {
+	};
+
 	chosen {
 		zephyr,console = &uart1;
 		zephyr,sram = &sram0;
diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c
index 782098214fd..79164fbc591 100644
--- a/drivers/watchdog/wdt_cmsdk_apb.c
+++ b/drivers/watchdog/wdt_cmsdk_apb.c
@@ -197,7 +197,7 @@ static int wdog_cmsdk_apb_init(struct device *dev)
 	return 0;
 }
 
-DEVICE_AND_API_INIT(wdog_cmsdk_apb, CONFIG_WDT_0_NAME,
+DEVICE_AND_API_INIT(wdog_cmsdk_apb, DT_INST_0_ARM_CMSDK_WATCHDOG_LABEL,
 		    wdog_cmsdk_apb_init,
 		    NULL, NULL,
 		    PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,