diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
index 82307e8c30d..a38b9a5badf 100644
--- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
+++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12
@@ -76,10 +76,16 @@ endif # UART_K20
 config BLUETOOTH_UART_ON_DEV_NAME
 	default "UART_1" if BLUETOOTH_UART
 
-config GPIO
+config PINMUX
 	def_bool y
 
-config PINMUX
+if PINMUX
+
+config PINMUX_K64
+	def_bool y
+endif
+
+config GPIO
 	def_bool y
 
 if GPIO
@@ -141,28 +147,6 @@ endif # I2C_1
 
 endif # I2C
 
-if PINMUX
-
-config PINMUX_K64
-	def_bool y
-
-if PINMUX_K64
-
-config PINMUX_K64_GPIO_A_NAME
-	default GPIO_K64_A_DEV_NAME
-config PINMUX_K64_GPIO_B_NAME
-	default GPIO_K64_B_DEV_NAME
-config PINMUX_K64_GPIO_C_NAME
-	default GPIO_K64_C_DEV_NAME
-config PINMUX_K64_GPIO_D_NAME
-	default GPIO_K64_D_DEV_NAME
-config PINMUX_K64_GPIO_E_NAME
-	default GPIO_K64_E_DEV_NAME
-
-endif # PINMUX_K64
-
-endif # PINMUX
-
 if PWM
 
 config PWM_K64_FTM
diff --git a/drivers/pinmux/Kconfig b/drivers/pinmux/Kconfig
index be7b673a02b..f0ddbdf6bd8 100644
--- a/drivers/pinmux/Kconfig
+++ b/drivers/pinmux/Kconfig
@@ -44,7 +44,12 @@ config PINMUX_INIT_PRIORITY
 	  The device needs to be initialized after all the devices it
 	  uses.
 
-source "drivers/pinmux/Kconfig.k64"
+config PINMUX_K64
+	bool "Freescale K64-based Pin multiplexer driver"
+	depends on SOC_MK64F12
+	default n
+	help
+	Enable driver for Freescale K64-based Pin multiplexer.
 
 source "drivers/pinmux/Kconfig.stm32"
 
diff --git a/drivers/pinmux/Kconfig.k64 b/drivers/pinmux/Kconfig.k64
deleted file mode 100644
index 72ac0b64a16..00000000000
--- a/drivers/pinmux/Kconfig.k64
+++ /dev/null
@@ -1,64 +0,0 @@
-# Kconfig.k64 - K64 PINMUX configuration options
-#
-#
-# Copyright (c) 2016 Intel Corporation
-# Copyright (c) 2016 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-menuconfig PINMUX_K64
-	bool "Freescale K64-based Pin multiplexer driver"
-	depends on PINMUX && SOC_MK64F12
-	default n
-	help
-	Enable driver for Freescale K64-based Pin multiplexer.
-
-if PINMUX_K64
-
-config PINMUX_K64_GPIO_A_NAME
-	string "Name of the Port A GPIO"
-	depends on PINMUX_K64 && GPIO_K64
-	default "GPIO_A"
-	help
-	The name of the Port A GPIO referred to as PTA0..PTA31.
-
-config PINMUX_K64_GPIO_B_NAME
-	string "Name of the Port B GPIO"
-	depends on PINMUX_K64 && GPIO_K64
-	default "GPIO_B"
-	help
-	The name of the Port B GPIO referred to as PTB0..PTB31.
-
-config PINMUX_K64_GPIO_C_NAME
-	string "Name of the Port C GPIO"
-	depends on PINMUX_K64 && GPIO_K64
-	default "GPIO_C"
-	help
-	The name of the Port C GPIO referred to as PTC0..PTC31.
-
-config PINMUX_K64_GPIO_D_NAME
-	string "Name of the Port D GPIO"
-	depends on PINMUX_K64 && GPIO_K64
-	default "GPIO_D"
-	help
-	The name of the Port D GPIO referred to as PTD0..PTD31.
-
-config PINMUX_K64_GPIO_E_NAME
-	string "Name of the Port E GPIO"
-	depends on PINMUX_K64 && GPIO_K64
-	default "GPIO_E"
-	help
-	The name of the Port E GPIO referred to as PTE0..PTE31.
-
-endif # PINMUX_K64