diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d9b0f6a469fd..8163a5983166 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -31,13 +31,6 @@ config DEBUG_PINCTRL
 	help
 	  Say Y here to add some extra checks and diagnostics to PINCTRL calls.
 
-config PINCTRL_TEGRA264
-	bool "NVIDIA Tegra264 Pinmux support"
-	select PINCTRL_TEGRA
-	default y
-	help
-	Support for the NVIDIA Tegra264 PINCTRL controller driver.
-
 config PINCTRL_AMD
 	bool "AMD GPIO pin control"
 	depends on HAS_IOMEM
diff --git a/drivers/soc/tegra/Kconfig b/drivers/soc/tegra/Kconfig
index a557ad2f1154..144957fa7755 100644
--- a/drivers/soc/tegra/Kconfig
+++ b/drivers/soc/tegra/Kconfig
@@ -135,6 +135,7 @@ config ARCH_TEGRA_234_SOC
 
 config ARCH_TEGRA_264_SOC
 	bool "NVIDIA Tegra264 SoC"
+	select PINCTRL_TEGRA264
 	help
 	  Enable support for the NVIDIA Tegra264 SoC.