diff --git a/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c b/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c
index 5137e74a7c8..4d2c8a8e55e 100644
--- a/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c
+++ b/boards/arm/adafruit_feather_m0_basic_proto/pinmux.c
@@ -9,9 +9,9 @@
 
 static int board_pinmux_init(struct device *dev)
 {
-	struct device *muxa = device_get_binding(DT_PINMUX_SAM0_A_LABEL);
+	struct device *muxa = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL);
 #if DT_SPI_SAM0_SERCOM4_BASE_ADDRESS
-	struct device *muxb = device_get_binding(DT_PINMUX_SAM0_B_LABEL);
+	struct device *muxb = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_B_LABEL);
 #endif
 	ARG_UNUSED(dev);
 
diff --git a/boards/arm/adafruit_trinket_m0/pinmux.c b/boards/arm/adafruit_trinket_m0/pinmux.c
index 0c516a2f92b..e14a8103ba5 100644
--- a/boards/arm/adafruit_trinket_m0/pinmux.c
+++ b/boards/arm/adafruit_trinket_m0/pinmux.c
@@ -9,7 +9,7 @@
 
 static int board_pinmux_init(struct device *dev)
 {
-	struct device *muxa = device_get_binding(DT_PINMUX_SAM0_A_LABEL);
+	struct device *muxa = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL);
 
 	ARG_UNUSED(dev);
 
diff --git a/boards/arm/arduino_zero/pinmux.c b/boards/arm/arduino_zero/pinmux.c
index ea19e0c9896..ac851197f6d 100644
--- a/boards/arm/arduino_zero/pinmux.c
+++ b/boards/arm/arduino_zero/pinmux.c
@@ -9,8 +9,8 @@
 
 static int board_pinmux_init(struct device *dev)
 {
-	struct device *muxa = device_get_binding(DT_PINMUX_SAM0_A_LABEL);
-	struct device *muxb = device_get_binding(DT_PINMUX_SAM0_B_LABEL);
+	struct device *muxa = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL);
+	struct device *muxb = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_B_LABEL);
 
 	ARG_UNUSED(dev);
 
diff --git a/boards/arm/atsamd20_xpro/pinmux.c b/boards/arm/atsamd20_xpro/pinmux.c
index 29a005d3d88..bc3de572a60 100644
--- a/boards/arm/atsamd20_xpro/pinmux.c
+++ b/boards/arm/atsamd20_xpro/pinmux.c
@@ -9,8 +9,8 @@
 
 static int board_pinmux_init(struct device *dev)
 {
-	struct device *muxa = device_get_binding(DT_PINMUX_SAM0_A_LABEL);
-	struct device *muxb = device_get_binding(DT_PINMUX_SAM0_B_LABEL);
+	struct device *muxa = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL);
+	struct device *muxb = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_B_LABEL);
 
 	ARG_UNUSED(dev);
 
diff --git a/boards/arm/atsamd21_xpro/pinmux.c b/boards/arm/atsamd21_xpro/pinmux.c
index cd77551a260..c89f5966527 100644
--- a/boards/arm/atsamd21_xpro/pinmux.c
+++ b/boards/arm/atsamd21_xpro/pinmux.c
@@ -9,8 +9,8 @@
 
 static int board_pinmux_init(struct device *dev)
 {
-	struct device *muxa = device_get_binding(DT_PINMUX_SAM0_A_LABEL);
-	struct device *muxb = device_get_binding(DT_PINMUX_SAM0_B_LABEL);
+	struct device *muxa = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL);
+	struct device *muxb = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_B_LABEL);
 
 	ARG_UNUSED(dev);
 
diff --git a/boards/arm/atsamr21_xpro/pinmux.c b/boards/arm/atsamr21_xpro/pinmux.c
index 6dcf8b978ed..837889dffe1 100644
--- a/boards/arm/atsamr21_xpro/pinmux.c
+++ b/boards/arm/atsamr21_xpro/pinmux.c
@@ -10,8 +10,8 @@
 
 static int board_pinmux_init(struct device *dev)
 {
-	struct device *muxa = device_get_binding(DT_PINMUX_SAM0_A_LABEL);
-	struct device *muxb = device_get_binding(DT_PINMUX_SAM0_B_LABEL);
+	struct device *muxa = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL);
+	struct device *muxb = device_get_binding(DT_ATMEL_SAM0_PINMUX_PINMUX_B_LABEL);
 
 	ARG_UNUSED(dev);
 
diff --git a/drivers/pinmux/pinmux_sam0.c b/drivers/pinmux/pinmux_sam0.c
index 9ee936bc158..950427941a6 100644
--- a/drivers/pinmux/pinmux_sam0.c
+++ b/drivers/pinmux/pinmux_sam0.c
@@ -69,34 +69,34 @@ const struct pinmux_driver_api pinmux_sam0_api = {
 	.input = pinmux_sam0_input,
 };
 
-#if DT_PINMUX_SAM0_A_BASE_ADDRESS
+#if DT_ATMEL_SAM0_PINMUX_PINMUX_A_BASE_ADDRESS
 static const struct pinmux_sam0_config pinmux_sam0_config_0 = {
-	.regs = (PortGroup *)DT_PINMUX_SAM0_A_BASE_ADDRESS,
+	.regs = (PortGroup *)DT_ATMEL_SAM0_PINMUX_PINMUX_A_BASE_ADDRESS,
 };
 
-DEVICE_AND_API_INIT(pinmux_sam0_0, DT_PINMUX_SAM0_A_LABEL,
+DEVICE_AND_API_INIT(pinmux_sam0_0, DT_ATMEL_SAM0_PINMUX_PINMUX_A_LABEL,
 		    pinmux_sam0_init, NULL, &pinmux_sam0_config_0,
 		    PRE_KERNEL_1, CONFIG_PINMUX_INIT_PRIORITY,
 		    &pinmux_sam0_api);
 #endif
 
-#if DT_PINMUX_SAM0_B_BASE_ADDRESS
+#if DT_ATMEL_SAM0_PINMUX_PINMUX_B_BASE_ADDRESS
 static const struct pinmux_sam0_config pinmux_sam0_config_1 = {
-	.regs = (PortGroup *)DT_PINMUX_SAM0_B_BASE_ADDRESS,
+	.regs = (PortGroup *)DT_ATMEL_SAM0_PINMUX_PINMUX_B_BASE_ADDRESS,
 };
 
-DEVICE_AND_API_INIT(pinmux_sam0_1, DT_PINMUX_SAM0_B_LABEL,
+DEVICE_AND_API_INIT(pinmux_sam0_1, DT_ATMEL_SAM0_PINMUX_PINMUX_B_LABEL,
 		    pinmux_sam0_init, NULL, &pinmux_sam0_config_1,
 		    PRE_KERNEL_1, CONFIG_PINMUX_INIT_PRIORITY,
 		    &pinmux_sam0_api);
 #endif
 
-#if DT_PINMUX_SAM0_C_BASE_ADDRESS
+#if DT_ATMEL_SAM0_PINMUX_PINMUX_C_BASE_ADDRESS
 static const struct pinmux_sam0_config pinmux_sam0_config_2 = {
-	.regs = (PortGroup *)DT_PINMUX_SAM0_C_BASE_ADDRESS,
+	.regs = (PortGroup *)DT_ATMEL_SAM0_PINMUX_PINMUX_C_BASE_ADDRESS,
 };
 
-DEVICE_AND_API_INIT(pinmux_sam0_2, DT_PINMUX_SAM0_C_LABEL,
+DEVICE_AND_API_INIT(pinmux_sam0_2, DT_ATMEL_SAM0_PINMUX_PINMUX_C_LABEL,
 		    pinmux_sam0_init, NULL, &pinmux_sam0_config_2,
 		    PRE_KERNEL_1, CONFIG_PINMUX_INIT_PRIORITY,
 		    &pinmux_sam0_api);
diff --git a/dts/arm/atmel/samd.dtsi b/dts/arm/atmel/samd.dtsi
index 60f19b006e3..870318bc275 100644
--- a/dts/arm/atmel/samd.dtsi
+++ b/dts/arm/atmel/samd.dtsi
@@ -33,6 +33,11 @@
 			<0x0080A048 0x4>;
 	};
 
+	aliases {
+		pinmux-a = &pinmux_a;
+		pinmux-b = &pinmux_b;
+	};
+
 	soc {
 		nvmctrl: nvmctrl@41004000  {
 			compatible = "atmel,sam0-nvmctrl";
diff --git a/dts/arm/atmel/samr21.dtsi b/dts/arm/atmel/samr21.dtsi
index 8739d6c58b0..228d06dd1cf 100644
--- a/dts/arm/atmel/samr21.dtsi
+++ b/dts/arm/atmel/samr21.dtsi
@@ -7,6 +7,10 @@
 #include <atmel/samd.dtsi>
 
 / {
+	aliases {
+		pinmux-c = &pinmux_c;
+	};
+
 	soc {
 		usb0: usb@41005000 {
 			compatible = "atmel,sam0-usb";
diff --git a/soc/arm/atmel_sam0/samd20/dts_fixup.h b/soc/arm/atmel_sam0/samd20/dts_fixup.h
index 0857913f245..aebe06baf28 100644
--- a/soc/arm/atmel_sam0/samd20/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samd20/dts_fixup.h
@@ -95,12 +95,6 @@
 #define DT_WDT_SAM0_BASE_ADDRESS DT_ATMEL_SAM0_WATCHDOG_40001000_BASE_ADDRESS
 #define CONFIG_WDT_0_NAME DT_WDT_SAM0_LABEL
 
-#define DT_PINMUX_SAM0_A_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004400_BASE_ADDRESS
-#define DT_PINMUX_SAM0_A_LABEL DT_ATMEL_SAM0_PINMUX_41004400_LABEL
-
-#define DT_PINMUX_SAM0_B_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004480_BASE_ADDRESS
-#define DT_PINMUX_SAM0_B_LABEL DT_ATMEL_SAM0_PINMUX_41004480_LABEL
-
 #define DT_RTC_SAM0_BASE_ADDRESS DT_ATMEL_SAM0_RTC_40001400_BASE_ADDRESS
 #define DT_RTC_SAM0_IRQ DT_ATMEL_SAM0_RTC_40001400_IRQ_0
 #define DT_RTC_SAM0_IRQ_PRIORITY DT_ATMEL_SAM0_RTC_40001400_IRQ_0_PRIORITY
diff --git a/soc/arm/atmel_sam0/samd21/dts_fixup.h b/soc/arm/atmel_sam0/samd21/dts_fixup.h
index 202cb362130..fae12165220 100644
--- a/soc/arm/atmel_sam0/samd21/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samd21/dts_fixup.h
@@ -107,12 +107,6 @@
 #define DT_WDT_SAM0_BASE_ADDRESS DT_ATMEL_SAM0_WATCHDOG_40001000_BASE_ADDRESS
 #define CONFIG_WDT_0_NAME DT_WDT_SAM0_LABEL
 
-#define DT_PINMUX_SAM0_A_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004400_BASE_ADDRESS
-#define DT_PINMUX_SAM0_A_LABEL DT_ATMEL_SAM0_PINMUX_41004400_LABEL
-
-#define DT_PINMUX_SAM0_B_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004480_BASE_ADDRESS
-#define DT_PINMUX_SAM0_B_LABEL DT_ATMEL_SAM0_PINMUX_41004480_LABEL
-
 #define DT_RTC_SAM0_BASE_ADDRESS DT_ATMEL_SAM0_RTC_40001400_BASE_ADDRESS
 #define DT_RTC_SAM0_IRQ DT_ATMEL_SAM0_RTC_40001400_IRQ_0
 #define DT_RTC_SAM0_IRQ_PRIORITY DT_ATMEL_SAM0_RTC_40001400_IRQ_0_PRIORITY
diff --git a/soc/arm/atmel_sam0/samr21/dts_fixup.h b/soc/arm/atmel_sam0/samr21/dts_fixup.h
index 9e02a09b920..16699bfacfc 100644
--- a/soc/arm/atmel_sam0/samr21/dts_fixup.h
+++ b/soc/arm/atmel_sam0/samr21/dts_fixup.h
@@ -114,15 +114,6 @@
 #define DT_WDT_SAM0_BASE_ADDRESS DT_ATMEL_SAM0_WATCHDOG_40001000_BASE_ADDRESS
 #define CONFIG_WDT_0_NAME DT_WDT_SAM0_LABEL
 
-#define DT_PINMUX_SAM0_A_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004400_BASE_ADDRESS
-#define DT_PINMUX_SAM0_A_LABEL DT_ATMEL_SAM0_PINMUX_41004400_LABEL
-
-#define DT_PINMUX_SAM0_B_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004480_BASE_ADDRESS
-#define DT_PINMUX_SAM0_B_LABEL DT_ATMEL_SAM0_PINMUX_41004480_LABEL
-
-#define DT_PINMUX_SAM0_C_BASE_ADDRESS DT_ATMEL_SAM0_PINMUX_41004500_BASE_ADDRESS
-#define DT_PINMUX_SAM0_C_LABEL DT_ATMEL_SAM0_PINMUX_41004500_LABEL
-
 #define DT_RTC_SAM0_BASE_ADDRESS DT_ATMEL_SAM0_RTC_40001400_BASE_ADDRESS
 #define DT_RTC_SAM0_IRQ DT_ATMEL_SAM0_RTC_40001400_IRQ_0
 #define DT_RTC_SAM0_IRQ_PRIORITY DT_ATMEL_SAM0_RTC_40001400_IRQ_0_PRIORITY