soc: ti: k3: Select PINCTRL in UART driver not Kconfig.defconfig

The default configuration for PINCTRL should not be set with the other default configurations in .defconfig, instead select a default value as part of defining the UART driver. Signed-off-by: Andrew Davis <afd@ti.com>
9 months ago · 9d0da02fbd
3 changed files with 1 additions and 6 deletions
--- a/boards/ti/sk_am62/sk_am62_am6234_m4_defconfig
+++ b/boards/ti/sk_am62/sk_am62_am6234_m4_defconfig
@ -11,9 +11,6 @@ CONFIG_CORTEX_M_SYSTICK=y
				@@ -11,9 +11,6 @@ CONFIG_CORTEX_M_SYSTICK=y
 # Zephyr Kernel Configuration
 CONFIG_XIP=n

-# Enable Pinctrl
-CONFIG_PINCTRL=y
-
 # Serial Driver
 CONFIG_SERIAL=y

--- a/drivers/serial/Kconfig.ns16550
+++ b/drivers/serial/Kconfig.ns16550
@ -69,6 +69,7 @@ config UART_NS16550_ACCESS_WORD_ONLY
				@@ -69,6 +69,7 @@ config UART_NS16550_ACCESS_WORD_ONLY

 config UART_NS16550_TI_K3
 	bool "Add support for NS16550 variant specific to TI K3 SoCs"
+	select PINCTRL
 	help
 	  Enabling this configuration allows the users to use the UART port in
 	  Texas Instruments K3 SoCs by enabling a vendor specific extended register
--- a/soc/ti/k3/am6x/Kconfig.defconfig
+++ b/soc/ti/k3/am6x/Kconfig.defconfig
@ -27,9 +27,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
				@@ -27,9 +27,6 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default 200000000 if SOC_SERIES_AM6X_A53
 	default 19200000 if SOC_SERIES_AM6X_R5

-config PINCTRL
-	default y
-
 if SERIAL

 config UART_NS16550