Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / drivers / gpu / drm / exynos / Kconfig

diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 5bf5bca94f562850ad96a9dcb654766d7632999a..178d2a9672a8245020f39f0059f013483a5a5169 100644 (file)
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -26,14 +26,14 @@ config DRM_EXYNOS_DMABUF
 
 config DRM_EXYNOS_FIMD
        bool "Exynos DRM FIMD"
-       depends on DRM_EXYNOS && !FB_S3C && !ARCH_MULTIPLATFORM
+       depends on DRM_EXYNOS && !FB_S3C
        select FB_MODE_HELPERS
        help
          Choose this option if you want to use Exynos FIMD for DRM.
 
 config DRM_EXYNOS_DPI
        bool "EXYNOS DRM parallel output support"
-       depends on DRM_EXYNOS
+       depends on DRM_EXYNOS_FIMD
        select DRM_PANEL
        default n
        help
@@ -41,7 +41,7 @@ config DRM_EXYNOS_DPI
 
 config DRM_EXYNOS_DSI
        bool "EXYNOS DRM MIPI-DSI driver support"
-       depends on DRM_EXYNOS
+       depends on DRM_EXYNOS_FIMD
        select DRM_MIPI_DSI
        select DRM_PANEL
        default n
@@ -50,7 +50,7 @@ config DRM_EXYNOS_DSI
 
 config DRM_EXYNOS_DP
        bool "EXYNOS DRM DP driver support"
-       depends on DRM_EXYNOS && ARCH_EXYNOS
+       depends on DRM_EXYNOS_FIMD && ARCH_EXYNOS && (DRM_PTN3460=n || DRM_PTN3460=y || DRM_PTN3460=DRM_EXYNOS)
        default DRM_EXYNOS
        help
          This enables support for DP device.