drm/tinydrm/Kconfig: Remove menuconfig DRM_TINYDRM

This makes the tiny drivers visible by default without having to enable a
knob.

Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com> to it once
Link: https://patchwork.freedesktop.org/patch/msgid/20190725105132.22545-2-noralf@tronnes.org

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 98c732f925c774e2e9e93dbdcdb224016e7ae54b..0b30afa7524db8055d58a2d79a480c115049042b 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -112,7 +112,7 @@ obj-$(CONFIG_DRM_ARCPGU)+= arc/
 obj-y                  += hisilicon/
 obj-$(CONFIG_DRM_ZTE)  += zte/
 obj-$(CONFIG_DRM_MXSFB)        += mxsfb/
-obj-$(CONFIG_DRM_TINYDRM) += tinydrm/
+obj-y                  += tinydrm/
 obj-$(CONFIG_DRM_PL111) += pl111/
 obj-$(CONFIG_DRM_TVE200) += tve200/
 obj-$(CONFIG_DRM_XEN) += xen/

diff --git a/drivers/gpu/drm/tinydrm/Kconfig b/drivers/gpu/drm/tinydrm/Kconfig
index 42b06f4f8989a714745ed761f2abcd41287c1ccd..f8c9a0e71dde889fb1f7337bb74b192cc7ef7475 100644 (file)
--- a/drivers/gpu/drm/tinydrm/Kconfig
+++ b/drivers/gpu/drm/tinydrm/Kconfig
@@ -1,16 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
-menuconfig DRM_TINYDRM
-       tristate "Support for simple displays"
-       depends on DRM
-       select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
-       help
-         Choose this option if you have a tinydrm supported display.
-         If M is selected the module will be called tinydrm.
-
 config TINYDRM_HX8357D
        tristate "DRM support for HX8357D display panels"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -21,7 +14,9 @@ config TINYDRM_HX8357D
 
 config TINYDRM_ILI9225
        tristate "DRM support for ILI9225 display panels"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DBI
        help
          DRM driver for the following Ilitek ILI9225 panels:
@@ -31,7 +26,9 @@ config TINYDRM_ILI9225
 
 config TINYDRM_ILI9341
        tristate "DRM support for ILI9341 display panels"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -42,7 +39,9 @@ config TINYDRM_ILI9341
 
 config TINYDRM_MI0283QT
        tristate "DRM support for MI0283QT"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -51,7 +50,9 @@ config TINYDRM_MI0283QT
 
 config TINYDRM_REPAPER
        tristate "DRM support for Pervasive Displays RePaper panels (V231)"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        depends on THERMAL || !THERMAL
        help
          DRM driver for the following Pervasive Displays panels:
@@ -64,7 +65,9 @@ config TINYDRM_REPAPER
 
 config TINYDRM_ST7586
        tristate "DRM support for Sitronix ST7586 display panels"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DBI
        help
          DRM driver for the following Sitronix ST7586 panels:
@@ -74,7 +77,9 @@ config TINYDRM_ST7586
 
 config TINYDRM_ST7735R
        tristate "DRM support for Sitronix ST7735R display panels"
-       depends on DRM_TINYDRM && SPI
+       depends on DRM && SPI
+       select DRM_KMS_HELPER
+       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help