Commit 5b63aa3f authored by Tomi Valkeinen's avatar Tomi Valkeinen

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: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
parent 9960aa7c
...@@ -2,7 +2,7 @@ config DRM_OMAP ...@@ -2,7 +2,7 @@ config DRM_OMAP
tristate "OMAP DRM" tristate "OMAP DRM"
depends on DRM depends on DRM
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
depends on OMAP2_DSS select OMAP2_DSS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_KMS_FB_HELPER select DRM_KMS_FB_HELPER
select FB_SYS_FILLRECT select FB_SYS_FILLRECT
...@@ -13,15 +13,18 @@ config DRM_OMAP ...@@ -13,15 +13,18 @@ config DRM_OMAP
help help
DRM display driver for OMAP2/3/4 based boards. DRM display driver for OMAP2/3/4 based boards.
if DRM_OMAP
config DRM_OMAP_NUM_CRTCS config DRM_OMAP_NUM_CRTCS
int "Number of CRTCs" int "Number of CRTCs"
range 1 10 range 1 10
default 1 if ARCH_OMAP2 || ARCH_OMAP3 default 1 if ARCH_OMAP2 || ARCH_OMAP3
default 2 if ARCH_OMAP4 default 2 if ARCH_OMAP4
depends on DRM_OMAP
help help
Select the number of video overlays which can be used as framebuffers. Select the number of video overlays which can be used as framebuffers.
The remaining overlays are reserved for video. The remaining overlays are reserved for video.
source "drivers/gpu/drm/omapdrm/dss/Kconfig" source "drivers/gpu/drm/omapdrm/dss/Kconfig"
source "drivers/gpu/drm/omapdrm/displays/Kconfig" source "drivers/gpu/drm/omapdrm/displays/Kconfig"
endif
menu "OMAP Display Device Drivers (new device model)" menu "OMAPDRM External Display Device Drivers"
depends on OMAP2_DSS
config DISPLAY_ENCODER_OPA362 config DISPLAY_ENCODER_OPA362
tristate "OPA362 external analog amplifier" tristate "OPA362 external analog amplifier"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment