diff options
| author |   Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-09 21:36:24 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2015-12-29 11:07:48 +0200 |
| commit | 5b63aa3feca79aebf14bc266690fd1d4a9ce4f2d (patch) | |
| tree | 29df67a840f9d6bdf50192afadccadfb0a0506b3 /drivers/gpu | |
| parent | drm/omap: move omapdss & displays under omapdrm (diff) | |
| download | linux-dev-5b63aa3feca79aebf14bc266690fd1d4a9ce4f2d.tar.xz linux-dev-5b63aa3feca79aebf14bc266690fd1d4a9ce4f2d.zip | |
drm/omap: make omapdrm select OMAP2_DSS
Now that omapdss is only for omapdrm, we can change omapdrm to select
OMAP2_DSS to enable omapdss if omapdrm is enabled, instead of omapdrm
depending on omapdss.
We can also change omapdss and the display drivers to depend on
DRM_OMAP, so that they are only visible under omapdrm in menuconfig.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Dave Airlie <airlied@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/gpu/drm/omapdrm/displays/Kconfig | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/drm/omapdrm/Kconfig b/drivers/gpu/drm/omapdrm/Kconfig index 49b5b7df6ba4..336ad4de9981 100644 --- a/drivers/gpu/drm/omapdrm/Kconfig +++ b/drivers/gpu/drm/omapdrm/Kconfig @@ -2,7 +2,7 @@ config DRM_OMAP tristate "OMAP DRM" depends on DRM depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM - depends on OMAP2_DSS + select OMAP2_DSS select DRM_KMS_HELPER select DRM_KMS_FB_HELPER select FB_SYS_FILLRECT @@ -13,15 +13,18 @@ config DRM_OMAP help DRM display driver for OMAP2/3/4 based boards. +if DRM_OMAP + config DRM_OMAP_NUM_CRTCS int "Number of CRTCs" range 1 10 default 1 if ARCH_OMAP2 || ARCH_OMAP3 default 2 if ARCH_OMAP4 - depends on DRM_OMAP help Select the number of video overlays which can be used as framebuffers. The remaining overlays are reserved for video. source "drivers/gpu/drm/omapdrm/dss/Kconfig" source "drivers/gpu/drm/omapdrm/displays/Kconfig" + +endif diff --git a/drivers/gpu/drm/omapdrm/displays/Kconfig b/drivers/gpu/drm/omapdrm/displays/Kconfig index 574710141a61..2a618afe0f53 100644 --- a/drivers/gpu/drm/omapdrm/displays/Kconfig +++ b/drivers/gpu/drm/omapdrm/displays/Kconfig @@ -1,5 +1,4 @@ -menu "OMAP Display Device Drivers (new device model)" - depends on OMAP2_DSS +menu "OMAPDRM External Display Device Drivers" config DISPLAY_ENCODER_OPA362 tristate "OPA362 external analog amplifier" |