diff --git a/boards/arm/96b_wistrio/pinmux.c b/boards/arm/96b_wistrio/pinmux.c
index 068d12a8196..13e2d7ee713 100644
--- a/boards/arm/96b_wistrio/pinmux.c
+++ b/boards/arm/96b_wistrio/pinmux.c
@@ -11,7 +11,7 @@
 #include <drivers/pinmux.h>
 #include <sys/sys_io.h>
 
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 static const struct pin_config pinconf[] = {
 	/* RF_CTX_PA */
diff --git a/boards/arm/stm32g0316_disco/pinmux.c b/boards/arm/stm32g0316_disco/pinmux.c
index 59c3354f180..178aef5fe45 100644
--- a/boards/arm/stm32g0316_disco/pinmux.c
+++ b/boards/arm/stm32g0316_disco/pinmux.c
@@ -9,8 +9,6 @@
 #include <stm32_ll_bus.h>
 #include <stm32_ll_system.h>
 
-#include <pinmux/stm32/pinmux_stm32.h>
-
 static int pinmux_stm32_init(const struct device *port)
 {
 	ARG_UNUSED(port);
diff --git a/drivers/adc/adc_stm32.c b/drivers/adc/adc_stm32.c
index 58d14108efa..67c2e22bdc6 100644
--- a/drivers/adc/adc_stm32.c
+++ b/drivers/adc/adc_stm32.c
@@ -26,7 +26,7 @@
 LOG_MODULE_REGISTER(adc_stm32);
 
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #if !defined(CONFIG_SOC_SERIES_STM32F0X) && \
 	!defined(CONFIG_SOC_SERIES_STM32G0X) && \
diff --git a/drivers/can/can_stm32.c b/drivers/can/can_stm32.c
index 17575dc99ca..ac3537bff9e 100644
--- a/drivers/can/can_stm32.c
+++ b/drivers/can/can_stm32.c
@@ -6,7 +6,7 @@
 
 #include <drivers/clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <sys/util.h>
 #include <string.h>
 #include <kernel.h>
diff --git a/drivers/can/can_stm32fd.c b/drivers/can/can_stm32fd.c
index 43256d95641..ef73b98a984 100644
--- a/drivers/can/can_stm32fd.c
+++ b/drivers/can/can_stm32fd.c
@@ -9,7 +9,7 @@
 #include <soc.h>
 #include <stm32_ll_rcc.h>
 #include "can_stm32fd.h"
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #include <logging/log.h>
 LOG_MODULE_DECLARE(can_driver, CONFIG_CAN_LOG_LEVEL);
diff --git a/drivers/can/can_stm32fd.h b/drivers/can/can_stm32fd.h
index 8901899e57a..a6637adb8d5 100644
--- a/drivers/can/can_stm32fd.h
+++ b/drivers/can/can_stm32fd.h
@@ -9,7 +9,7 @@
 #define ZEPHYR_DRIVERS_CAN_STM32FD_H_
 
 #include "can_mcan.h"
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #define DEV_DATA(dev) ((struct can_stm32fd_data *)(dev)->data)
 #define DEV_CFG(dev) ((const struct can_stm32fd_config *)(dev)->config)
diff --git a/drivers/dac/dac_stm32.c b/drivers/dac/dac_stm32.c
index 924c59b853b..0e92b8fedaf 100644
--- a/drivers/dac/dac_stm32.c
+++ b/drivers/dac/dac_stm32.c
@@ -20,7 +20,7 @@
 LOG_MODULE_REGISTER(dac_stm32);
 
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 /* some low-end MCUs have DAC with only one channel */
 #ifdef LL_DAC_CHANNEL_2
diff --git a/drivers/disk/sdmmc_stm32.c b/drivers/disk/sdmmc_stm32.c
index 37476ee5c90..34ad97d2038 100644
--- a/drivers/disk/sdmmc_stm32.c
+++ b/drivers/disk/sdmmc_stm32.c
@@ -10,7 +10,7 @@
 #include <drivers/disk.h>
 #include <drivers/clock_control.h>
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <drivers/gpio.h>
 #include <logging/log.h>
 #include <soc.h>
diff --git a/drivers/ethernet/eth_stm32_hal.c b/drivers/ethernet/eth_stm32_hal.c
index 9b3430374d6..17639d11c08 100644
--- a/drivers/ethernet/eth_stm32_hal.c
+++ b/drivers/ethernet/eth_stm32_hal.c
@@ -26,7 +26,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME);
 #include <sys/printk.h>
 #include <drivers/clock_control.h>
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #include "eth.h"
 #include "eth_stm32_hal_priv.h"
diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c
index a8447a77682..ab680753398 100644
--- a/drivers/flash/flash_stm32_qspi.c
+++ b/drivers/flash/flash_stm32_qspi.c
@@ -13,7 +13,7 @@
 #include <arch/common/ffs.h>
 #include <sys/util.h>
 #include <soc.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <drivers/clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
 #include <drivers/flash.h>
diff --git a/drivers/gpio/gpio_stm32.c b/drivers/gpio/gpio_stm32.c
index 32db1a73bfb..017f1c84379 100644
--- a/drivers/gpio/gpio_stm32.c
+++ b/drivers/gpio/gpio_stm32.c
@@ -18,7 +18,7 @@
 #include <stm32_ll_system.h>
 #include <drivers/gpio.h>
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <drivers/pinmux.h>
 #include <sys/util.h>
 #include <drivers/interrupt_controller/exti_stm32.h>
diff --git a/drivers/gpio/gpio_stm32.h b/drivers/gpio/gpio_stm32.h
index 06ab54be502..10db0e04cb4 100644
--- a/drivers/gpio/gpio_stm32.h
+++ b/drivers/gpio/gpio_stm32.h
@@ -12,7 +12,7 @@
  */
 
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <drivers/gpio.h>
 
 /* GPIO buses definitions */
diff --git a/drivers/i2c/i2c_ll_stm32.c b/drivers/i2c/i2c_ll_stm32.c
index 8ea869071cd..484579480a9 100644
--- a/drivers/i2c/i2c_ll_stm32.c
+++ b/drivers/i2c/i2c_ll_stm32.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <drivers/i2c.h>
 #include <drivers/pinmux.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include "i2c_ll_stm32.h"
 
 #define LOG_LEVEL CONFIG_I2C_LOG_LEVEL
diff --git a/drivers/i2s/i2s_ll_stm32.c b/drivers/i2s/i2s_ll_stm32.c
index 951c7effc6e..bc56a55f173 100644
--- a/drivers/i2s/i2s_ll_stm32.c
+++ b/drivers/i2s/i2s_ll_stm32.c
@@ -15,7 +15,7 @@
 #include <stm32_ll_spi.h>
 #include <drivers/clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #include "i2s_ll_stm32.h"
 #include <logging/log.h>
diff --git a/drivers/memc/memc_stm32.c b/drivers/memc/memc_stm32.c
index f47223d3fad..aa406ae5b19 100644
--- a/drivers/memc/memc_stm32.c
+++ b/drivers/memc/memc_stm32.c
@@ -9,7 +9,7 @@
 #include <device.h>
 
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #include <logging/log.h>
 LOG_MODULE_REGISTER(memc_stm32, CONFIG_MEMC_LOG_LEVEL);
diff --git a/drivers/pinmux/CMakeLists.txt b/drivers/pinmux/CMakeLists.txt
index 7118eab09b6..55fd58d73cb 100644
--- a/drivers/pinmux/CMakeLists.txt
+++ b/drivers/pinmux/CMakeLists.txt
@@ -12,5 +12,5 @@ zephyr_sources_ifdef(CONFIG_PINMUX_MCUX_LPC        pinmux_mcux_lpc.c)
 zephyr_sources_ifdef(CONFIG_PINMUX_RV32M1          pinmux_rv32m1.c)
 zephyr_sources_ifdef(CONFIG_PINMUX_SAM0            pinmux_sam0.c)
 zephyr_sources_ifdef(CONFIG_PINMUX_SIFIVE          pinmux_sifive.c)
-zephyr_sources_ifdef(CONFIG_PINMUX_STM32           stm32/pinmux_stm32.c)
+zephyr_sources_ifdef(CONFIG_PINMUX_STM32           pinmux_stm32.c)
 zephyr_sources_ifdef(CONFIG_PINMUX_XEC             pinmux_mchp_xec.c)
diff --git a/drivers/pinmux/stm32/pinmux_stm32.c b/drivers/pinmux/pinmux_stm32.c
similarity index 99%
rename from drivers/pinmux/stm32/pinmux_stm32.c
rename to drivers/pinmux/pinmux_stm32.c
index 0a7c866a296..89bc63f695c 100644
--- a/drivers/pinmux/stm32/pinmux_stm32.c
+++ b/drivers/pinmux/pinmux_stm32.c
@@ -21,7 +21,7 @@
 #include <drivers/pinmux.h>
 #include <gpio/gpio_stm32.h>
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <pm/device_runtime.h>
 
 #define GPIO_DEVICE(gpio_port)						\
diff --git a/drivers/pinmux/stm32/pinmux_stm32.h b/drivers/pinmux/pinmux_stm32.h
similarity index 100%
rename from drivers/pinmux/stm32/pinmux_stm32.h
rename to drivers/pinmux/pinmux_stm32.h
diff --git a/drivers/pwm/pwm_stm32.c b/drivers/pwm/pwm_stm32.c
index 55897ac6ada..b05208673ff 100644
--- a/drivers/pwm/pwm_stm32.c
+++ b/drivers/pwm/pwm_stm32.c
@@ -18,7 +18,7 @@
 #include <init.h>
 
 #include <drivers/clock_control/stm32_clock_control.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 
 #include <logging/log.h>
 LOG_MODULE_REGISTER(pwm_stm32, CONFIG_PWM_LOG_LEVEL);
diff --git a/drivers/serial/uart_stm32.c b/drivers/serial/uart_stm32.c
index 8c543cae9fb..4d1436d1674 100644
--- a/drivers/serial/uart_stm32.c
+++ b/drivers/serial/uart_stm32.c
@@ -21,7 +21,7 @@
 #include <init.h>
 #include <drivers/uart.h>
 #include <drivers/pinmux.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <drivers/clock_control.h>
 
 #ifdef CONFIG_UART_ASYNC_API
diff --git a/drivers/spi/spi_ll_stm32.c b/drivers/spi/spi_ll_stm32.c
index fbb7c8cea8f..00c773ed65e 100644
--- a/drivers/spi/spi_ll_stm32.c
+++ b/drivers/spi/spi_ll_stm32.c
@@ -21,7 +21,7 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
 #include <dt-bindings/dma/stm32_dma.h>
 #include <drivers/dma.h>
 #endif
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include <drivers/clock_control/stm32_clock_control.h>
 #include <drivers/clock_control.h>
 
diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c
index aaf70133d52..b6ab9e18264 100644
--- a/drivers/usb/device/usb_dc_stm32.c
+++ b/drivers/usb/device/usb_dc_stm32.c
@@ -24,7 +24,7 @@
 #include <drivers/clock_control/stm32_clock_control.h>
 #include <sys/util.h>
 #include <drivers/gpio.h>
-#include <pinmux/stm32/pinmux_stm32.h>
+#include <pinmux/pinmux_stm32.h>
 #include "stm32_hsem.h"
 
 #define LOG_LEVEL CONFIG_USB_DRIVER_LOG_LEVEL