drivers: display: Remove unnecessary Kconfig settings

galak · carlescufi · commit 63769bd1c1a6 · 2022-08-09T12:27:44.000+02:00
Have the display enabled in devicetree will now get the driver
enabled by default when CONFIG_DISPLAY=y is set.  So we can remove
setting driver enabling Kconfig values in various .conf and
defconfig files.

Signed-off-by: Kumar Gala &lt;galak@kernel.org&gt;
diff --git a/boards/arm/bl5340_dvk/Kconfig.defconfig b/boards/arm/bl5340_dvk/Kconfig.defconfig
@@ -93,10 +93,6 @@ DT_COMPAT_TI_TCA9538 := ti,tca9538
 config I2C
 default $(dt_compat_on_bus,$(DT_COMPAT_TI_TCA9538),i2c)
 
-# enable SPI when enabling display drivers (for ILI9341)
-config SPI
-	default y if DISPLAY
-
 endif # BOARD_BL5340_DVK_CPUAPP || BOARD_BL5340_DVK_CPUAPP_NS
 
 config BOARD
diff --git a/boards/arm/pinetime_devkit0/Kconfig.defconfig b/boards/arm/pinetime_devkit0/Kconfig.defconfig
@@ -11,16 +11,6 @@ config BOARD
 config BT_CTLR
 	default BT
 
-if DISPLAY
-
-config SPI
-	default y
-
-config ST7789V
-	default y
-
-endif # DISPLAY
-
 if FLASH
 
 config SPI
diff --git a/boards/arm/reel_board/Kconfig.defconfig b/boards/arm/reel_board/Kconfig.defconfig
@@ -24,16 +24,6 @@ endchoice
 
 endif # FXOS8700
 
-if DISPLAY
-
-config SSD16XX
-	default y
-
-config SPI
-	default y
-
-endif # DISPLAY
-
 if LVGL
 
 choice LV_COLOR_DEPTH
diff --git a/boards/arm/stm32f429i_disc1/Kconfig.defconfig b/boards/arm/stm32f429i_disc1/Kconfig.defconfig
@@ -8,9 +8,6 @@ if BOARD_STM32F429I_DISC1
 config BOARD
 	default "stm32f429i_disc1"
 
-config SPI
-	default y if DISPLAY
-
 config MEMC
 	default y if DISPLAY
 
diff --git a/boards/posix/native_posix/Kconfig.defconfig b/boards/posix/native_posix/Kconfig.defconfig
@@ -54,10 +54,6 @@ config UART_CONSOLE
 
 endif # CONSOLE
 
-config SDL_DISPLAY
-	default y
-	depends on DISPLAY
-
 config KSCAN_SDL
 	default y
 	depends on KSCAN
diff --git a/boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig b/boards/shields/adafruit_2_8_tft_touch_v2/Kconfig.defconfig
@@ -8,9 +8,6 @@ config GPIO
 
 if DISPLAY
 
-config SPI
-	default y
-
 if KSCAN
 
 config I2C
diff --git a/boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig b/boards/shields/buydisplay_2_8_tft_touch_arduino/Kconfig.defconfig
@@ -5,9 +5,6 @@ if SHIELD_BUYDISPLAY_2_8_TFT_TOUCH_ARDUINO
 
 if DISPLAY
 
-config SPI
-	default y
-
 if KSCAN
 
 config I2C
diff --git a/boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig b/boards/shields/buydisplay_3_5_tft_touch_arduino/Kconfig.defconfig
@@ -5,9 +5,6 @@ if SHIELD_BUYDISPLAY_3_5_TFT_TOUCH_ARDUINO
 
 if DISPLAY
 
-config SPI
-	default y
-
 if KSCAN
 
 config I2C
diff --git a/boards/shields/ls0xx_generic/Kconfig.defconfig b/boards/shields/ls0xx_generic/Kconfig.defconfig
@@ -5,12 +5,6 @@ if SHIELD_LS013B7DH03
 
 if DISPLAY
 
-config SPI
-	default y
-
-config LS0XX
-	default y
-
 if LVGL
 
 config LV_Z_VDB_SIZE
diff --git a/boards/shields/max7219/Kconfig.defconfig b/boards/shields/max7219/Kconfig.defconfig
diff --git a/boards/shields/ssd1306/Kconfig.defconfig b/boards/shields/ssd1306/Kconfig.defconfig
@@ -5,23 +5,6 @@ if SHIELD_SSD1306_128X64 || SHIELD_SSD1306_128X64_SPI || SHIELD_SSD1306_128X32 |
 
 if DISPLAY
 
-if SHIELD_SSD1306_128X64_SPI
-
-config SPI
-	default y
-
-endif # SHIELD_SSD1306_128X64_SPI
-
-if SHIELD_SSD1306_128X64 || SHIELD_SSD1306_128X32 || SHIELD_SH1106_128X64
-
-config I2C
-	default y
-
-endif # SHIELD_SSD1306_128X64 || SHIELD_SSD1306_128X32 || SHIELD_SH1106_128X64
-
-config SSD1306
-	default y
-
 choice SSD1306_CONTROLLER_TYPE
 	default SSD1306_SH1106_COMPATIBLE if SHIELD_SH1106_128X64
 endchoice
diff --git a/boards/shields/st7735r/Kconfig.defconfig b/boards/shields/st7735r/Kconfig.defconfig
@@ -5,13 +5,6 @@ if SHIELD_ST7735R_ADA_160x128
 
 if DISPLAY
 
-config SPI
-	default y
-
-config ST7735R
-	default y
-
-
 if LVGL
 
 config LV_Z_BITS_PER_PIXEL
diff --git a/boards/shields/st7789v_generic/Kconfig.defconfig b/boards/shields/st7789v_generic/Kconfig.defconfig
@@ -5,12 +5,6 @@ if SHIELD_ST7789V_TL019FQV01 || SHIELD_ST7789V_WAVESHARE_240X240
 
 if DISPLAY
 
-config SPI
-	default y
-
-config ST7789V
-	default y
-
 choice ST7789V_PIXEL_FORMAT
 	default ST7789V_RGB888 if SHIELD_ST7789V_TL019FQV01
 	default ST7789V_RGB565 if SHIELD_ST7789V_WAVESHARE_240X240
diff --git a/boards/shields/waveshare_epaper/Kconfig.defconfig b/boards/shields/waveshare_epaper/Kconfig.defconfig
@@ -10,19 +10,6 @@ if SHIELD_WAVESHARE_EPAPER_GDEH029A1 || SHIELD_WAVESHARE_EPAPER_GDEH0213B1 || SH
 
 if DISPLAY
 
-config SPI
-	default y
-
-config SSD16XX
-	default y if SHIELD_WAVESHARE_EPAPER_GDEH029A1
-	default y if SHIELD_WAVESHARE_EPAPER_GDEH0213B1
-	default y if SHIELD_WAVESHARE_EPAPER_GDEH0213B72
-	default y if SHIELD_WAVESHARE_EPAPER_GDEH0154A07
-
-config UC81XX
-	default y if SHIELD_WAVESHARE_EPAPER_GDEW075T7
-	default y if SHIELD_WAVESHARE_EPAPER_GDEW042T2
-
 if LVGL
 
 config LV_Z_VDB_SIZE
diff --git a/boards/xtensa/esp_wrover_kit/Kconfig.defconfig b/boards/xtensa/esp_wrover_kit/Kconfig.defconfig
@@ -24,9 +24,5 @@ endchoice
 
 endif # BT
 
-# enable SPI when enabling display drivers (for ILI9341)
-config SPI
-	default y if DISPLAY
-
 config DISK_DRIVER_SDMMC
 	default y
diff --git a/boards/xtensa/odroid_go/Kconfig.defconfig b/boards/xtensa/odroid_go/Kconfig.defconfig
@@ -14,7 +14,7 @@ config DISK_DRIVER_SDMMC
 	default y if DISK_ACCESS
 
 config SPI
-	default y if DISPLAY || DISK_DRIVER_SDMMC
+	default y if DISK_DRIVER_SDMMC
 
 if BT
 
diff --git a/drivers/display/Kconfig.ls0xx b/drivers/display/Kconfig.ls0xx
@@ -3,6 +3,8 @@
 
 config LS0XX
 	bool "LS0XX memory display controller driver"
-	depends on SPI
+	default y
+	depends on DT_HAS_SHARP_LS0XX_ENABLED
+	select SPI
 	help
 	  Enable driver for sharp memory display series LS0XXX7DXXX
diff --git a/samples/boards/nrf/nrf_led_matrix/prj.conf b/samples/boards/nrf/nrf_led_matrix/prj.conf
@@ -1,2 +1 @@
 CONFIG_DISPLAY=y
-CONFIG_DISPLAY_NRF_LED_MATRIX=y
diff --git a/samples/boards/reel_board/mesh_badge/prj.conf b/samples/boards/reel_board/mesh_badge/prj.conf
@@ -59,7 +59,6 @@ CONFIG_SPI_ASYNC=y
 
 CONFIG_HEAP_MEM_POOL_SIZE=16384
 CONFIG_DISPLAY=y
-CONFIG_SSD16XX=y
 
 CONFIG_CHARACTER_FRAMEBUFFER=y
 
diff --git a/samples/subsys/display/cfb/boards/reel_board.conf b/samples/subsys/display/cfb/boards/reel_board.conf
@@ -1,2 +1 @@
 CONFIG_SPI=y
-CONFIG_SSD16XX=y
diff --git a/samples/subsys/display/cfb/boards/reel_board_v2.conf b/samples/subsys/display/cfb/boards/reel_board_v2.conf
@@ -1,2 +1 @@
 CONFIG_SPI=y
-CONFIG_SSD16XX=y
diff --git a/samples/subsys/display/cfb_shell/boards/reel_board.conf b/samples/subsys/display/cfb_shell/boards/reel_board.conf
@@ -1,2 +1 @@
 CONFIG_SPI=y
-CONFIG_SSD16XX=y
diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series
@@ -12,10 +12,6 @@ config ROM_START_OFFSET
 	default 0x400 if BOOTLOADER_MCUBOOT
 	default 0x2000 if BOOT_FLEXSPI_NOR || BOOT_SEMC_NOR
 
-config DISPLAY_MCUX_ELCDIF
-	default y if HAS_MCUX_ELCDIF
-	depends on DISPLAY
-
 config PINCTRL_IMX
 	default y if HAS_MCUX_IOMUXC
 	depends on PINCTRL
