Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/omapdrm/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/omapdrm/displays/Kconfig

+1 −2
Original line number Diff line number Diff line 
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"