diff --git a/boards/arm/stm32g0316_disco/CMakeLists.txt b/boards/arm/stm32g0316_disco/CMakeLists.txt
deleted file mode 100644
index 59170926fda..00000000000
--- a/boards/arm/stm32g0316_disco/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-if(CONFIG_PINMUX)
-zephyr_library()
-zephyr_library_sources(pinmux.c)
-endif()
diff --git a/boards/arm/stm32g0316_disco/pinmux.c b/boards/arm/stm32g0316_disco/pinmux.c
deleted file mode 100644
index 178aef5fe45..00000000000
--- a/boards/arm/stm32g0316_disco/pinmux.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2019 SEAL AG
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <init.h>
-#include <soc.h>
-#include <stm32_ll_bus.h>
-#include <stm32_ll_system.h>
-
-static int pinmux_stm32_init(const struct device *port)
-{
-	ARG_UNUSED(port);
-
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(usart1), okay) && CONFIG_SERIAL
-	/* Remap PA11 to PA9 */
-	LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_SYSCFG);
-	LL_SYSCFG_EnablePinRemap(LL_SYSCFG_PIN_RMP_PA11);
-#endif
-
-	return 0;
-}
-
-SYS_INIT(pinmux_stm32_init, PRE_KERNEL_1,
-	 CONFIG_PINMUX_STM32_DEVICE_INITIALIZATION_PRIORITY);
diff --git a/boards/arm/stm32g0316_disco/stm32g0316_disco.dts b/boards/arm/stm32g0316_disco/stm32g0316_disco.dts
index e05fc30fa0b..1e9d8b48912 100644
--- a/boards/arm/stm32g0316_disco/stm32g0316_disco.dts
+++ b/boards/arm/stm32g0316_disco/stm32g0316_disco.dts
@@ -62,6 +62,10 @@
 	apb1-prescaler = <1>;
 };
 
+&pinctrl {
+	remap-pa11;
+};
+
 &usart1 {
 	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pb7>;
 	current-speed = <115200>;