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: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20241216074450.8590-2-tzimmermann@suse.de

diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 57ded82c284095268084c4882bd009330ad564d5..e8b3f67bf3f56bdca3159652fae9040337ceec49 100644 (file)
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -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

diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig
index 4d77e17541e95b154f810aa389c27752808d4bf6..ca0c90e9583790cbca15ba956b371b8b0cb63c47 100644 (file)
--- a/arch/powerpc/configs/ppc6xx_defconfig
+++ b/arch/powerpc/configs/ppc6xx_defconfig
@@ -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

diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig
index 21545ffba0658f6bca1c71436f18c48674dd7e9d..8934e6ad5772b4e0ade9e76bce488761afabb317 100644 (file)
--- a/drivers/auxdisplay/Kconfig
+++ b/drivers/auxdisplay/Kconfig
@@ -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

diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index fb38f684444f2c07b832b6e5251aadfeb2b398ef..d00e713c10920c511c46f661da34fecd31531fb9 100644 (file)
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -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

diff --git a/drivers/staging/fbtft/Kconfig b/drivers/staging/fbtft/Kconfig
index 77ab44362f167e2a6b92672fc9739565d35e3aa2..dcf6a70455cc248e3a32b1d2cde737b384fcd7f0 100644 (file)
--- a/drivers/staging/fbtft/Kconfig
+++ b/drivers/staging/fbtft/Kconfig
@@ -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

diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index de035071fedb1b8a3fcef5d950ec778d10a7b962..55c6686f091e79908c117ebeb36b5d2d3501f91a 100644 (file)
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -649,6 +649,7 @@ config FB_S1D13XXX
 config FB_ATMEL
        tristate "AT91 LCD Controller support"
        depends on FB && OF && HAVE_CLK && HAS_IOMEM
+       depends on BACKLIGHT_CLASS_DEVICE
        depends on HAVE_FB_ATMEL || COMPILE_TEST
        select FB_BACKLIGHT
        select FB_IOMEM_HELPERS
@@ -660,7 +661,6 @@ config FB_ATMEL
 config FB_NVIDIA
        tristate "nVidia Framebuffer Support"
        depends on FB && PCI
-       select FB_BACKLIGHT if FB_NVIDIA_BACKLIGHT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -700,6 +700,8 @@ config FB_NVIDIA_DEBUG
 config FB_NVIDIA_BACKLIGHT
        bool "Support for backlight control"
        depends on FB_NVIDIA
+       depends on BACKLIGHT_CLASS_DEVICE=y || BACKLIGHT_CLASS_DEVICE=FB_NVIDIA
+       select FB_BACKLIGHT
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -707,7 +709,6 @@ config FB_NVIDIA_BACKLIGHT
 config FB_RIVA
        tristate "nVidia Riva support"
        depends on FB && PCI
-       select FB_BACKLIGHT if FB_RIVA_BACKLIGHT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -747,6 +748,8 @@ config FB_RIVA_DEBUG
 config FB_RIVA_BACKLIGHT
        bool "Support for backlight control"
        depends on FB_RIVA
+       depends on BACKLIGHT_CLASS_DEVICE=y || BACKLIGHT_CLASS_DEVICE=FB_RIVA
+       select FB_BACKLIGHT
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -934,7 +937,6 @@ config FB_MATROX_MAVEN
 config FB_RADEON
        tristate "ATI Radeon display support"
        depends on FB && PCI
-       select FB_BACKLIGHT if FB_RADEON_BACKLIGHT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -960,6 +962,8 @@ config FB_RADEON_I2C
 config FB_RADEON_BACKLIGHT
        bool "Support for backlight control"
        depends on FB_RADEON
+       depends on BACKLIGHT_CLASS_DEVICE=y || BACKLIGHT_CLASS_DEVICE=FB_RADEON
+       select FB_BACKLIGHT
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -975,7 +979,6 @@ config FB_RADEON_DEBUG
 config FB_ATY128
        tristate "ATI Rage128 display support"
        depends on FB && PCI
-       select FB_BACKLIGHT if FB_ATY128_BACKLIGHT
        select FB_IOMEM_HELPERS
        select FB_MACMODES if PPC_PMAC
        help
@@ -989,6 +992,8 @@ config FB_ATY128
 config FB_ATY128_BACKLIGHT
        bool "Support for backlight control"
        depends on FB_ATY128
+       depends on BACKLIGHT_CLASS_DEVICE=y || BACKLIGHT_CLASS_DEVICE=FB_ATY128
+       select FB_BACKLIGHT
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -999,7 +1004,6 @@ config FB_ATY
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       select FB_BACKLIGHT if FB_ATY_BACKLIGHT
        select FB_IOMEM_FOPS
        select FB_MACMODES if PPC
        select FB_ATY_CT if SPARC64 && PCI
@@ -1040,6 +1044,8 @@ config FB_ATY_GX
 config FB_ATY_BACKLIGHT
        bool "Support for backlight control"
        depends on FB_ATY
+       depends on BACKLIGHT_CLASS_DEVICE=y || BACKLIGHT_CLASS_DEVICE=FB_ATY
+       select FB_BACKLIGHT
        default y
        help
          Say Y here if you want to control the backlight of your display.
@@ -1528,6 +1534,7 @@ config FB_SH_MOBILE_LCDC
        depends on FB && HAVE_CLK && HAS_IOMEM
        depends on SUPERH || COMPILE_TEST
        depends on FB_DEVICE
+       depends on BACKLIGHT_CLASS_DEVICE
        select FB_BACKLIGHT
        select FB_DEFERRED_IO
        select FB_DMAMEM_HELPERS
@@ -1793,6 +1800,7 @@ config FB_SSD1307
        tristate "Solomon SSD1307 framebuffer support"
        depends on FB && I2C
        depends on GPIOLIB || COMPILE_TEST
+       depends on BACKLIGHT_CLASS_DEVICE
        select FB_BACKLIGHT
        select FB_SYSMEM_HELPERS_DEFERRED
        help

diff --git a/drivers/video/fbdev/core/Kconfig b/drivers/video/fbdev/core/Kconfig
index 0ab8848ba2f10f4d1afea1333a13c9e78aa081f4..d554d8c543d4920159eebd796e956c84145e4e32 100644 (file)
--- a/drivers/video/fbdev/core/Kconfig
+++ b/drivers/video/fbdev/core/Kconfig
@@ -183,9 +183,8 @@ config FB_SYSMEM_HELPERS_DEFERRED
        select FB_SYSMEM_HELPERS
 
 config FB_BACKLIGHT
-       tristate
+       bool
        depends on FB
-       select BACKLIGHT_CLASS_DEVICE
 
 config FB_MODE_HELPERS
        bool "Enable Video Mode Handling Helpers"