diff --git a/drivers/can/Kconfig b/drivers/can/Kconfig
index 213b23eb639..90a626b9f2a 100644
--- a/drivers/can/Kconfig
+++ b/drivers/can/Kconfig
@@ -88,7 +88,6 @@ config CAN_QEMU_IFACE_NAME
 source "drivers/can/Kconfig.sam"
 source "drivers/can/Kconfig.sam0"
 source "drivers/can/Kconfig.stm32"
-source "drivers/can/Kconfig.stm32fd"
 source "drivers/can/Kconfig.stm32h7"
 source "drivers/can/Kconfig.mcux"
 source "drivers/can/Kconfig.mcp2515"
diff --git a/drivers/can/Kconfig.stm32 b/drivers/can/Kconfig.stm32
index a807406e7e1..ff05b7e15b1 100644
--- a/drivers/can/Kconfig.stm32
+++ b/drivers/can/Kconfig.stm32
@@ -1,6 +1,6 @@
 # STM32 CAN configuration options
 
-# Copyright (c) 2018 Alexander Wachter
+# Copyright (c) 2018-2020 Alexander Wachter
 # SPDX-License-Identifier: Apache-2.0
 
 config CAN_STM32_BXCAN
@@ -45,3 +45,30 @@ config CAN_MAX_EXT_ID_FILTER
 	    CAN_MAX_STD_ID_FILTER + CAN_MAX_EXT_ID_FILTER * 2 <= 28
 
 endif # CAN_STM32_BXCAN
+
+config CAN_STM32FD
+	bool "STM32 FDCAN driver"
+	default y
+	depends on DT_HAS_ST_STM32_FDCAN_ENABLED
+	select CAN_MCAN
+	select USE_STM32_LL_RCC
+
+if CAN_STM32FD
+
+config CAN_MAX_STD_ID_FILTER
+	int "Maximum number of std ID filters"
+	default 28
+	range 0 28
+	help
+	  Defines the maximum number of filters with standard ID (11-bit)
+	  that can be attached.
+
+config CAN_MAX_EXT_ID_FILTER
+	int "Maximum number of ext ID filters"
+	default 8
+	range 0 8
+	help
+	  Defines the maximum number of filters with extended ID (29-bit)
+	  that can be attached.
+
+endif # CAN_STM32FD
diff --git a/drivers/can/Kconfig.stm32fd b/drivers/can/Kconfig.stm32fd
deleted file mode 100644
index c9ea02c796e..00000000000
--- a/drivers/can/Kconfig.stm32fd
+++ /dev/null
@@ -1,31 +0,0 @@
-# STM32 CAN configuration options
-
-# Copyright (c) 2020 Alexander Wachter
-# SPDX-License-Identifier: Apache-2.0
-
-config CAN_STM32FD
-	bool "STM32 FDCAN driver"
-	default y
-	depends on DT_HAS_ST_STM32_FDCAN_ENABLED
-	select CAN_MCAN
-	select USE_STM32_LL_RCC
-
-if CAN_STM32FD
-
-config CAN_MAX_STD_ID_FILTER
-	int "Maximum number of std ID filters"
-	default 28
-	range 0 28
-	help
-	  Defines the maximum number of filters with standard ID (11-bit)
-	  that can be attached.
-
-config CAN_MAX_EXT_ID_FILTER
-	int "Maximum number of ext ID filters"
-	default 8
-	range 0 8
-	help
-	  Defines the maximum number of filters with extended ID (29-bit)
-	  that can be attached.
-
-endif # CAN_STM32FD