soc: atmel: Drop PINCTRL from Kconfig.defconfig

This Kconfig has wrongly been added to defconfig files. It is not the right place for it. It has never been the right place for it. Drivers that need it should select the symbol in their Kconfig entries. Drop PINCTL from Kconfig.defconfig and add proper select at Kconfig.sam*. Fixes #78619 Signed-off-by: Gerson Fernando Budke <[email protected]>
zephyrproject-rtos · Nov 4, 2024 · 0cc8f93 · 0cc8f93
1 parent 0bb5270
commit 0cc8f93
Show file tree

Hide file tree

Showing 26 changed files with 26 additions and 6 deletions.
diff --git a/drivers/adc/Kconfig.sam b/drivers/adc/Kconfig.sam
@@ -5,6 +5,7 @@ config ADC_SAM
 	bool "Atmel SAM series ADC Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_ADC_ENABLED
+	select PINCTRL
 	select ADC_CONFIGURABLE_INPUTS
 	help
 	  Enable Atmel SAM MCU Family Analog-to-Digital Converter (ADC) driver.
diff --git a/drivers/adc/Kconfig.sam0 b/drivers/adc/Kconfig.sam0
@@ -5,6 +5,7 @@ config ADC_SAM0
 	bool "Atmel SAM0 series ADC Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_ADC_ENABLED
+	select PINCTRL
 	select ADC_CONFIGURABLE_INPUTS
 	help
 	  Enable Atmel SAM0 MCU Family Analog-to-Digital Converter (ADC) driver.
diff --git a/drivers/adc/Kconfig.sam_afec b/drivers/adc/Kconfig.sam_afec
@@ -7,6 +7,7 @@ config ADC_SAM_AFEC
 	bool "SAM ADC Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_AFEC_ENABLED
+	select PINCTRL
 	help
 	  Enable Atmel SAM MCU Family Analog-to-Digital Converter (ADC) driver
 	  based on AFEC module.
diff --git a/drivers/counter/Kconfig.sam b/drivers/counter/Kconfig.sam
@@ -5,5 +5,6 @@ config COUNTER_SAM_TC
 	bool "Atmel SAM MCU family counter (TC) driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_TC_ENABLED
+	select PINCTRL
 	help
 	  Enable the Atmel SAM MCU family counter (TC) driver.
diff --git a/drivers/counter/Kconfig.sam0 b/drivers/counter/Kconfig.sam0
@@ -5,6 +5,7 @@ config COUNTER_SAM0_TC32
 	bool "SAM0 series 32-bit basic timer driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_TC32_ENABLED
+	select PINCTRL
 	help
 	  Enable the SAM0 series timer counter (TC) driver in 32-bit wide
 	  mode.
diff --git a/drivers/dac/Kconfig.sam b/drivers/dac/Kconfig.sam
@@ -6,5 +6,6 @@ config DAC_SAM
 	bool "Atmel SAM DAC driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_DAC_ENABLED
+	select PINCTRL
 	help
 	  Enable Atmel SAM MCU Family Digital Audio Converter (DAC) driver.
diff --git a/drivers/dac/Kconfig.sam0 b/drivers/dac/Kconfig.sam0
@@ -5,5 +5,6 @@ config DAC_SAM0
 	bool "Atmel SAM0 series DAC Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_DAC_ENABLED
+	select PINCTRL
 	help
 	  Enables the Atmel SAM0 MCU Family Digital-to-Analog (DAC) driver.
diff --git a/drivers/ethernet/Kconfig.sam_gmac b/drivers/ethernet/Kconfig.sam_gmac
@@ -12,6 +12,7 @@ menuconfig ETH_SAM_GMAC
 	select NOCACHE_MEMORY if ARCH_HAS_NOCACHE_MEMORY_SUPPORT
 	select MDIO
 	select ETH_DSA_SUPPORT
+	select PINCTRL
 	help
 	  Enable Atmel SAM MCU Family Ethernet driver.
 

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
@@ -177,13 +177,15 @@ config I2C_SAM_TWIM
 	bool "Atmel SAM (TWIM) I2C driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_I2C_TWIM_ENABLED
+	select PINCTRL
 	help
 	  Enable Atmel SAM MCU Family (TWIM) I2C bus driver.
 
 config I2C_SAM_TWI
 	bool "Atmel SAM (TWI) I2C driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_I2C_TWI_ENABLED
+	select PINCTRL
 	help
 	  Enable Atmel SAM MCU Family (TWI) I2C bus driver.
 

diff --git a/drivers/i2c/Kconfig.sam0 b/drivers/i2c/Kconfig.sam0
@@ -5,6 +5,7 @@ menuconfig I2C_SAM0
 	bool "SAM0 series I2C SERCOM driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_I2C_ENABLED
+	select PINCTRL
 	help
 	  Enable the SAM0 series SERCOM I2C driver.
 

diff --git a/drivers/i2c/Kconfig.sam_twihs b/drivers/i2c/Kconfig.sam_twihs
@@ -7,5 +7,6 @@ config I2C_SAM_TWIHS
 	bool "Atmel SAM (TWIHS) I2C driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_I2C_TWIHS_ENABLED
+	select PINCTRL
 	help
 	  Enable Atmel SAM MCU Family (TWIHS) I2C bus driver.
diff --git a/drivers/i2s/Kconfig.sam_ssc b/drivers/i2s/Kconfig.sam_ssc
@@ -7,6 +7,7 @@ menuconfig I2S_SAM_SSC
 	bool "Atmel SAM MCU family I2S (SSC) Bus Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_SSC_ENABLED
+	select PINCTRL
 	select DMA
 	help
 	  Enable Inter Sound (I2S) bus driver for Atmel SAM MCU family based on

diff --git a/drivers/memc/Kconfig.sam b/drivers/memc/Kconfig.sam
@@ -5,5 +5,6 @@ config MEMC_SAM_SMC
 	bool "Atmel Static Memory Controller (SMC)"
 	default y
 	depends on DT_HAS_ATMEL_SAM_SMC_ENABLED
+	select PINCTRL
 	help
 	  Enable Atmel Static Memory Controller.
diff --git a/drivers/pwm/Kconfig.sam b/drivers/pwm/Kconfig.sam
@@ -7,5 +7,6 @@ config PWM_SAM
 	bool "Atmel SAM MCU Family PWM Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_PWM_ENABLED
+	select PINCTRL
 	help
 	  Enable PWM driver for Atmel SAM MCUs.
diff --git a/drivers/pwm/Kconfig.sam0 b/drivers/pwm/Kconfig.sam0
@@ -7,5 +7,6 @@ config PWM_SAM0_TCC
 	bool "Atmel SAM0 MCU Family TCC PWM Driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_TCC_PWM_ENABLED
+	select PINCTRL
 	help
 	  Enable PWM driver for Atmel SAM0 MCUs using the TCC timer/counter.
diff --git a/drivers/sdhc/Kconfig.sam_hsmci b/drivers/sdhc/Kconfig.sam_hsmci
@@ -5,6 +5,7 @@ config SAM_HSMCI
 	bool "ATMEL SAM HSMCI driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_HSMCI_ENABLED
+	select PINCTRL
 	select SDHC_SUPPORTS_NATIVE_MODE
 	help
 	  Enable the ATMEL SAM HSMCI MMC/SD card driver.

diff --git a/drivers/sensor/qdec_sam/Kconfig b/drivers/sensor/qdec_sam/Kconfig
@@ -9,5 +9,6 @@ config QDEC_SAM
 	default y
 	depends on DT_HAS_ATMEL_SAM_TC_QDEC_ENABLED
 	depends on SOC_FAMILY_ATMEL_SAM
+	select PINCTRL
 	help
 	  Atmel SAM MCU family Quadrature Decoder (TC) driver.
diff --git a/drivers/serial/Kconfig.sam0 b/drivers/serial/Kconfig.sam0
@@ -7,6 +7,7 @@ config UART_SAM0
 	bool "Atmel SAM0 series SERCOM USART driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_UART_ENABLED
+	select PINCTRL
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	select SERIAL_SUPPORT_ASYNC if DT_HAS_ATMEL_SAM0_DMAC_ENABLED

diff --git a/drivers/serial/Kconfig.uart_sam b/drivers/serial/Kconfig.uart_sam
@@ -8,6 +8,7 @@ config UART_SAM
 	bool "Atmel SAM MCU family UART driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_UART_ENABLED
+	select PINCTRL
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	help

diff --git a/drivers/serial/Kconfig.usart_sam b/drivers/serial/Kconfig.usart_sam
@@ -7,6 +7,7 @@ config USART_SAM
 	bool "Atmel SAM MCU family USART driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_USART_ENABLED
+	select PINCTRL
 	select SERIAL_HAS_DRIVER
 	select SERIAL_SUPPORT_INTERRUPT
 	help

diff --git a/drivers/spi/Kconfig.sam b/drivers/spi/Kconfig.sam
@@ -8,6 +8,7 @@ config SPI_SAM
 	bool "Atmel SAM series SPI driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_SPI_ENABLED
+	select PINCTRL
 	select GPIO
 	help
 	  Enable support for the SAM SPI driver.

diff --git a/drivers/spi/Kconfig.sam0 b/drivers/spi/Kconfig.sam0
@@ -7,6 +7,7 @@ config SPI_SAM0
 	bool "Atmel SAM0 series SERCOM SPI driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_SPI_ENABLED
+	select PINCTRL
 	select DMA if SPI_ASYNC
 	help
 	  Enable support for the SAM0 SERCOM SPI driver.
diff --git a/drivers/timer/Kconfig.sam0_rtc b/drivers/timer/Kconfig.sam0_rtc
@@ -7,6 +7,7 @@ config SAM0_RTC_TIMER
 	bool "Atmel SAM0 series RTC timer"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_RTC_ENABLED
+	select PINCTRL
 	select TICKLESS_CAPABLE
 	help
 	  This module implements a kernel device driver for the Atmel SAM0

diff --git a/drivers/usb/device/Kconfig b/drivers/usb/device/Kconfig
@@ -71,6 +71,7 @@ config USB_DC_SAM0
 	bool "SAM0 series USB Device Controller driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM0_USB_ENABLED
+	select PINCTRL
 	help
 	  SAM0 family USB device controller Driver.
 
@@ -88,6 +89,7 @@ config USB_DC_SAM_USBC
 	bool "SAM4L USBC Device Controller driver"
 	default y
 	depends on DT_HAS_ATMEL_SAM_USBC_ENABLED
+	select PINCTRL
 	help
 	  SAM4L family USBC device controller Driver.
 

diff --git a/soc/atmel/sam/Kconfig.defconfig b/soc/atmel/sam/Kconfig.defconfig
@@ -14,9 +14,6 @@ config CLOCK_CONTROL
 config GPIO
 	default y
 
-config PINCTRL
-	default y
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)
 

diff --git a/soc/atmel/sam0/Kconfig.defconfig b/soc/atmel/sam0/Kconfig.defconfig
@@ -14,9 +14,6 @@ config GPIO
 config HWINFO_SAM0
 	default HWINFO
 
-config PINCTRL
-	default y
-
 config SYS_CLOCK_HW_CYCLES_PER_SEC
 	default $(dt_node_int_prop_int,/cpus/cpu@0,clock-frequency)