Commit 8fc38062 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

fbdev: Fix recursive dependencies wrt BACKLIGHT_CLASS_DEVICE 



Do not select BACKLIGHT_CLASS_DEVICE from FB_BACKLIGHT. The latter
only controls backlight support within fbdev core code and data
structures.

Make fbdev drivers depend on BACKLIGHT_CLASS_DEVICE and let users
select it explicitly. Fixes warnings about recursive dependencies,
such as

error: recursive dependency detected!
	symbol BACKLIGHT_CLASS_DEVICE is selected by FB_BACKLIGHT
	symbol FB_BACKLIGHT is selected by FB_SH_MOBILE_LCDC
	symbol FB_SH_MOBILE_LCDC depends on FB_DEVICE
	symbol FB_DEVICE depends on FB_CORE
	symbol FB_CORE is selected by DRM_GEM_DMA_HELPER
	symbol DRM_GEM_DMA_HELPER is selected by DRM_PANEL_ILITEK_ILI9341
	symbol DRM_PANEL_ILITEK_ILI9341 depends on BACKLIGHT_CLASS_DEVICE

BACKLIGHT_CLASS_DEVICE is user-selectable, so making drivers adapt to
it is the correct approach in any case. For most drivers, backlight
support is also configurable separately.

v3:
- Select BACKLIGHT_CLASS_DEVICE in PowerMac defconfigs (Christophe)
- Fix PMAC_BACKLIGHT module dependency corner cases (Christophe)
v2:
- s/BACKLIGHT_DEVICE_CLASS/BACKLIGHT_CLASS_DEVICE (Helge)
- Fix fbdev driver-dependency corner case (Arnd)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241216074450.8590-2-tzimmermann@suse.de
parent 9398332f

arch/powerpc/configs/pmac32_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ CONFIG_FB_ATY=y 
CONFIG_FB_ATY_CT=y

CONFIG_FB_ATY_GX=y

CONFIG_FB_3DFX=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

arch/powerpc/configs/ppc6xx_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -716,6 +716,7 @@ CONFIG_FB_TRIDENT=m 
CONFIG_FB_SM501=m

CONFIG_FB_IBM_GXT4500=y

CONFIG_LCD_PLATFORM=m

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y

CONFIG_LOGO=y

drivers/auxdisplay/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ config IMG_ASCII_LCD 


config HT16K33

	tristate "Holtek Ht16K33 LED controller with keyscan"

	depends on FB && I2C && INPUT

	depends on FB && I2C && INPUT && BACKLIGHT_CLASS_DEVICE

	select FB_SYSMEM_HELPERS

	select INPUT_MATRIXKMAP

	select FB_BACKLIGHT

drivers/macintosh/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ config PMAC_MEDIABAY 
config PMAC_BACKLIGHT

	bool "Backlight control for LCD screens"

	depends on PPC_PMAC && ADB_PMU && FB = y && (BROKEN || !PPC64)

	depends on BACKLIGHT_CLASS_DEVICE=y

	select FB_BACKLIGHT

	help

	  Say Y here to enable Macintosh specific extensions of the generic

drivers/staging/fbtft/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ menuconfig FB_TFT 
	tristate "Support for small TFT LCD display modules"

	depends on FB && SPI

	depends on FB_DEVICE

	depends on BACKLIGHT_CLASS_DEVICE

	depends on GPIOLIB || COMPILE_TEST

	select FB_BACKLIGHT

	select FB_SYSMEM_HELPERS_DEFERRED