diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2019-01-17 08:33:35 -0500 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2019-04-03 06:15:57 -0400 |
commit | 8c5dc8d9f19c7992b5ed557b865127a80149041b (patch) | |
tree | 8f7dee732082dd97a9d99f36251e1c73e7aee249 | |
parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) |
video: backlight: Remove useless BACKLIGHT_LCD_SUPPORT kernel symbol
We have two *_CLASS_DEVICE kernel config options (LCD_CLASS_DEVICE
and BACKLIGHT_LCD_DEVICE) that do the same job.
The patch removes useless BACKLIGHT_LCD_SUPPORT option
and converts LCD_CLASS_DEVICE into a menu.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | arch/unicore32/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/bridge/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/fsl-dcu/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/Kconfig | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/shmobile/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/tilcdc/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/olpc_dcon/Kconfig | 1 | ||||
-rw-r--r-- | drivers/usb/misc/Kconfig | 1 | ||||
-rw-r--r-- | drivers/video/backlight/Kconfig | 10 | ||||
-rw-r--r-- | drivers/video/fbdev/Kconfig | 5 |
12 files changed, 2 insertions, 25 deletions
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig index 817d82608712..8cbcbb12372c 100644 --- a/arch/unicore32/Kconfig +++ b/arch/unicore32/Kconfig | |||
@@ -195,7 +195,6 @@ config I2C_EEPROM_AT24 | |||
195 | 195 | ||
196 | config LCD_BACKLIGHT | 196 | config LCD_BACKLIGHT |
197 | tristate "LCD Backlight support" | 197 | tristate "LCD Backlight support" |
198 | select BACKLIGHT_LCD_SUPPORT | ||
199 | select BACKLIGHT_PWM | 198 | select BACKLIGHT_PWM |
200 | 199 | ||
201 | endmenu | 200 | endmenu |
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index bd943a71756c..1e68c1bbed2a 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig | |||
@@ -194,7 +194,6 @@ config DRM_RADEON | |||
194 | select POWER_SUPPLY | 194 | select POWER_SUPPLY |
195 | select HWMON | 195 | select HWMON |
196 | select BACKLIGHT_CLASS_DEVICE | 196 | select BACKLIGHT_CLASS_DEVICE |
197 | select BACKLIGHT_LCD_SUPPORT | ||
198 | select INTERVAL_TREE | 197 | select INTERVAL_TREE |
199 | help | 198 | help |
200 | Choose this option if you have an ATI Radeon graphics card. There | 199 | Choose this option if you have an ATI Radeon graphics card. There |
@@ -215,7 +214,6 @@ config DRM_AMDGPU | |||
215 | select POWER_SUPPLY | 214 | select POWER_SUPPLY |
216 | select HWMON | 215 | select HWMON |
217 | select BACKLIGHT_CLASS_DEVICE | 216 | select BACKLIGHT_CLASS_DEVICE |
218 | select BACKLIGHT_LCD_SUPPORT | ||
219 | select INTERVAL_TREE | 217 | select INTERVAL_TREE |
220 | select CHASH | 218 | select CHASH |
221 | help | 219 | help |
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 8840f396a7b6..3dff9997f5e3 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig | |||
@@ -76,7 +76,6 @@ config DRM_PARADE_PS8622 | |||
76 | depends on OF | 76 | depends on OF |
77 | select DRM_PANEL | 77 | select DRM_PANEL |
78 | select DRM_KMS_HELPER | 78 | select DRM_KMS_HELPER |
79 | select BACKLIGHT_LCD_SUPPORT | ||
80 | select BACKLIGHT_CLASS_DEVICE | 79 | select BACKLIGHT_CLASS_DEVICE |
81 | ---help--- | 80 | ---help--- |
82 | Parade eDP-LVDS bridge chip driver. | 81 | Parade eDP-LVDS bridge chip driver. |
diff --git a/drivers/gpu/drm/fsl-dcu/Kconfig b/drivers/gpu/drm/fsl-dcu/Kconfig index 14a72c4c496d..dc825883400d 100644 --- a/drivers/gpu/drm/fsl-dcu/Kconfig +++ b/drivers/gpu/drm/fsl-dcu/Kconfig | |||
@@ -2,7 +2,6 @@ config DRM_FSL_DCU | |||
2 | tristate "DRM Support for Freescale DCU" | 2 | tristate "DRM Support for Freescale DCU" |
3 | depends on DRM && OF && ARM && COMMON_CLK | 3 | depends on DRM && OF && ARM && COMMON_CLK |
4 | select BACKLIGHT_CLASS_DEVICE | 4 | select BACKLIGHT_CLASS_DEVICE |
5 | select BACKLIGHT_LCD_SUPPORT | ||
6 | select DRM_KMS_HELPER | 5 | select DRM_KMS_HELPER |
7 | select DRM_KMS_CMA_HELPER | 6 | select DRM_KMS_CMA_HELPER |
8 | select DRM_PANEL | 7 | select DRM_PANEL |
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 148be8e1a090..3d5f1cb6a76c 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig | |||
@@ -15,7 +15,6 @@ config DRM_I915 | |||
15 | select IRQ_WORK | 15 | select IRQ_WORK |
16 | # i915 depends on ACPI_VIDEO when ACPI is enabled | 16 | # i915 depends on ACPI_VIDEO when ACPI is enabled |
17 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick | 17 | # but for select to work, need to select ACPI_VIDEO's dependencies, ick |
18 | select BACKLIGHT_LCD_SUPPORT if ACPI | ||
19 | select BACKLIGHT_CLASS_DEVICE if ACPI | 18 | select BACKLIGHT_CLASS_DEVICE if ACPI |
20 | select INPUT if ACPI | 19 | select INPUT if ACPI |
21 | select ACPI_VIDEO if ACPI | 20 | select ACPI_VIDEO if ACPI |
diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig index 00cd9ab8948d..5f3cad0eb92e 100644 --- a/drivers/gpu/drm/nouveau/Kconfig +++ b/drivers/gpu/drm/nouveau/Kconfig | |||
@@ -5,14 +5,12 @@ config DRM_NOUVEAU | |||
5 | select DRM_KMS_HELPER | 5 | select DRM_KMS_HELPER |
6 | select DRM_TTM | 6 | select DRM_TTM |
7 | select BACKLIGHT_CLASS_DEVICE if DRM_NOUVEAU_BACKLIGHT | 7 | select BACKLIGHT_CLASS_DEVICE if DRM_NOUVEAU_BACKLIGHT |
8 | select BACKLIGHT_LCD_SUPPORT if DRM_NOUVEAU_BACKLIGHT | ||
9 | select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && INPUT | 8 | select ACPI_VIDEO if ACPI && X86 && BACKLIGHT_CLASS_DEVICE && INPUT |
10 | select X86_PLATFORM_DEVICES if ACPI && X86 | 9 | select X86_PLATFORM_DEVICES if ACPI && X86 |
11 | select ACPI_WMI if ACPI && X86 | 10 | select ACPI_WMI if ACPI && X86 |
12 | select MXM_WMI if ACPI && X86 | 11 | select MXM_WMI if ACPI && X86 |
13 | select POWER_SUPPLY | 12 | select POWER_SUPPLY |
14 | # Similar to i915, we need to select ACPI_VIDEO and it's dependencies | 13 | # Similar to i915, we need to select ACPI_VIDEO and it's dependencies |
15 | select BACKLIGHT_LCD_SUPPORT if ACPI && X86 | ||
16 | select BACKLIGHT_CLASS_DEVICE if ACPI && X86 | 14 | select BACKLIGHT_CLASS_DEVICE if ACPI && X86 |
17 | select INPUT if ACPI && X86 | 15 | select INPUT if ACPI && X86 |
18 | select THERMAL if ACPI && X86 | 16 | select THERMAL if ACPI && X86 |
diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig index 61bbe8e8bcc5..e2a6c82c8252 100644 --- a/drivers/gpu/drm/shmobile/Kconfig +++ b/drivers/gpu/drm/shmobile/Kconfig | |||
@@ -4,7 +4,6 @@ config DRM_SHMOBILE | |||
4 | depends on DRM && ARM | 4 | depends on DRM && ARM |
5 | depends on ARCH_SHMOBILE || COMPILE_TEST | 5 | depends on ARCH_SHMOBILE || COMPILE_TEST |
6 | select BACKLIGHT_CLASS_DEVICE | 6 | select BACKLIGHT_CLASS_DEVICE |
7 | select BACKLIGHT_LCD_SUPPORT | ||
8 | select DRM_KMS_HELPER | 7 | select DRM_KMS_HELPER |
9 | select DRM_KMS_CMA_HELPER | 8 | select DRM_KMS_CMA_HELPER |
10 | select DRM_GEM_CMA_HELPER | 9 | select DRM_GEM_CMA_HELPER |
diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig index 52598049c096..cb7df2086aee 100644 --- a/drivers/gpu/drm/tilcdc/Kconfig +++ b/drivers/gpu/drm/tilcdc/Kconfig | |||
@@ -8,7 +8,6 @@ config DRM_TILCDC | |||
8 | select DRM_PANEL_BRIDGE | 8 | select DRM_PANEL_BRIDGE |
9 | select VIDEOMODE_HELPERS | 9 | select VIDEOMODE_HELPERS |
10 | select BACKLIGHT_CLASS_DEVICE | 10 | select BACKLIGHT_CLASS_DEVICE |
11 | select BACKLIGHT_LCD_SUPPORT | ||
12 | help | 11 | help |
13 | Choose this option if you have an TI SoC with LCDC display | 12 | Choose this option if you have an TI SoC with LCDC display |
14 | controller, for example AM33xx in beagle-bone, DA8xx, or | 13 | controller, for example AM33xx in beagle-bone, DA8xx, or |
diff --git a/drivers/staging/olpc_dcon/Kconfig b/drivers/staging/olpc_dcon/Kconfig index 192cc8d0853f..c91a56f77bcb 100644 --- a/drivers/staging/olpc_dcon/Kconfig +++ b/drivers/staging/olpc_dcon/Kconfig | |||
@@ -2,7 +2,6 @@ config FB_OLPC_DCON | |||
2 | tristate "One Laptop Per Child Display CONtroller support" | 2 | tristate "One Laptop Per Child Display CONtroller support" |
3 | depends on OLPC && FB | 3 | depends on OLPC && FB |
4 | depends on I2C | 4 | depends on I2C |
5 | depends on BACKLIGHT_LCD_SUPPORT | ||
6 | depends on (GPIO_CS5535 || GPIO_CS5535=n) | 5 | depends on (GPIO_CS5535 || GPIO_CS5535=n) |
7 | select BACKLIGHT_CLASS_DEVICE | 6 | select BACKLIGHT_CLASS_DEVICE |
8 | help | 7 | help |
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index be04c117fe80..c97f270338bf 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
@@ -142,7 +142,6 @@ config USB_FTDI_ELAN | |||
142 | 142 | ||
143 | config USB_APPLEDISPLAY | 143 | config USB_APPLEDISPLAY |
144 | tristate "Apple Cinema Display support" | 144 | tristate "Apple Cinema Display support" |
145 | select BACKLIGHT_LCD_SUPPORT | ||
146 | select BACKLIGHT_CLASS_DEVICE | 145 | select BACKLIGHT_CLASS_DEVICE |
147 | help | 146 | help |
148 | Say Y here if you want to control the backlight of Apple Cinema | 147 | Say Y here if you want to control the backlight of Apple Cinema |
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig index 71ee978c848f..3fdc18e85ff5 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig | |||
@@ -2,13 +2,7 @@ | |||
2 | # Backlight & LCD drivers configuration | 2 | # Backlight & LCD drivers configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | menuconfig BACKLIGHT_LCD_SUPPORT | 5 | menu "Backlight & LCD device support" |
6 | bool "Backlight & LCD device support" | ||
7 | help | ||
8 | Enable this to be able to choose the drivers for controlling the | ||
9 | backlight and the LCD panel on some platforms, for example on PDAs. | ||
10 | |||
11 | if BACKLIGHT_LCD_SUPPORT | ||
12 | 6 | ||
13 | # | 7 | # |
14 | # LCD | 8 | # LCD |
@@ -466,4 +460,4 @@ config BACKLIGHT_RAVE_SP | |||
466 | 460 | ||
467 | endif # BACKLIGHT_CLASS_DEVICE | 461 | endif # BACKLIGHT_CLASS_DEVICE |
468 | 462 | ||
469 | endif # BACKLIGHT_LCD_SUPPORT | 463 | endmenu |
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 58a9590c9db6..068294881eb9 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig | |||
@@ -186,7 +186,6 @@ config FB_MACMODES | |||
186 | config FB_BACKLIGHT | 186 | config FB_BACKLIGHT |
187 | tristate | 187 | tristate |
188 | depends on FB | 188 | depends on FB |
189 | select BACKLIGHT_LCD_SUPPORT | ||
190 | select BACKLIGHT_CLASS_DEVICE | 189 | select BACKLIGHT_CLASS_DEVICE |
191 | 190 | ||
192 | config FB_MODE_HELPERS | 191 | config FB_MODE_HELPERS |
@@ -281,7 +280,6 @@ config FB_ARMCLCD | |||
281 | select FB_CFB_IMAGEBLIT | 280 | select FB_CFB_IMAGEBLIT |
282 | select FB_MODE_HELPERS if OF | 281 | select FB_MODE_HELPERS if OF |
283 | select VIDEOMODE_HELPERS if OF | 282 | select VIDEOMODE_HELPERS if OF |
284 | select BACKLIGHT_LCD_SUPPORT if OF | ||
285 | select BACKLIGHT_CLASS_DEVICE if OF | 283 | select BACKLIGHT_CLASS_DEVICE if OF |
286 | help | 284 | help |
287 | This framebuffer device driver is for the ARM PrimeCell PL110 | 285 | This framebuffer device driver is for the ARM PrimeCell PL110 |
@@ -315,7 +313,6 @@ config FB_ACORN | |||
315 | config FB_CLPS711X | 313 | config FB_CLPS711X |
316 | tristate "CLPS711X LCD support" | 314 | tristate "CLPS711X LCD support" |
317 | depends on FB && (ARCH_CLPS711X || COMPILE_TEST) | 315 | depends on FB && (ARCH_CLPS711X || COMPILE_TEST) |
318 | select BACKLIGHT_LCD_SUPPORT | ||
319 | select FB_MODE_HELPERS | 316 | select FB_MODE_HELPERS |
320 | select FB_SYS_FILLRECT | 317 | select FB_SYS_FILLRECT |
321 | select FB_SYS_COPYAREA | 318 | select FB_SYS_COPYAREA |
@@ -343,7 +340,6 @@ config FB_SA1100 | |||
343 | config FB_IMX | 340 | config FB_IMX |
344 | tristate "Freescale i.MX1/21/25/27 LCD support" | 341 | tristate "Freescale i.MX1/21/25/27 LCD support" |
345 | depends on FB && ARCH_MXC | 342 | depends on FB && ARCH_MXC |
346 | select BACKLIGHT_LCD_SUPPORT | ||
347 | select LCD_CLASS_DEVICE | 343 | select LCD_CLASS_DEVICE |
348 | select FB_CFB_FILLRECT | 344 | select FB_CFB_FILLRECT |
349 | select FB_CFB_COPYAREA | 345 | select FB_CFB_COPYAREA |
@@ -2192,7 +2188,6 @@ config FB_MX3 | |||
2192 | tristate "MX3 Framebuffer support" | 2188 | tristate "MX3 Framebuffer support" |
2193 | depends on FB && MX3_IPU | 2189 | depends on FB && MX3_IPU |
2194 | select BACKLIGHT_CLASS_DEVICE | 2190 | select BACKLIGHT_CLASS_DEVICE |
2195 | select BACKLIGHT_LCD_SUPPORT | ||
2196 | select FB_CFB_FILLRECT | 2191 | select FB_CFB_FILLRECT |
2197 | select FB_CFB_COPYAREA | 2192 | select FB_CFB_COPYAREA |
2198 | select FB_CFB_IMAGEBLIT | 2193 | select FB_CFB_IMAGEBLIT |