diff options
author | Sean Paul <seanpaul@chromium.org> | 2017-09-21 23:18:46 +0200 |
---|---|---|
committer | Sean Paul <seanpaul@chromium.org> | 2017-09-21 23:18:46 +0200 |
commit | 1ebfc603d046f1dda6507d11803f9b4046cee712 (patch) | |
tree | 3be6790f2ce819929b1ccff7993c636e0944705a /drivers/gpu/drm/bridge/synopsys/Kconfig | |
parent | qxl: fix primary surface handling (diff) | |
parent | Merge tag 'kbuild-fixes-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
download | linux-1ebfc603d046f1dda6507d11803f9b4046cee712.tar.xz linux-1ebfc603d046f1dda6507d11803f9b4046cee712.zip |
Merge remote-tracking branch 'origin/master' into drm-misc-fixes
Pick up 4.14-rc1
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/bridge/synopsys/Kconfig')
-rw-r--r-- | drivers/gpu/drm/bridge/synopsys/Kconfig | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig index 53e78d092d18..3cc53b44186e 100644 --- a/drivers/gpu/drm/bridge/synopsys/Kconfig +++ b/drivers/gpu/drm/bridge/synopsys/Kconfig @@ -2,6 +2,7 @@ config DRM_DW_HDMI tristate select DRM_KMS_HELPER select REGMAP_MMIO + select CEC_CORE if CEC_NOTIFIER config DRM_DW_HDMI_AHB_AUDIO tristate "Synopsys Designware AHB Audio interface" @@ -22,3 +23,18 @@ config DRM_DW_HDMI_I2S_AUDIO help Support the I2S Audio interface which is part of the Synopsys Designware HDMI block. + +config DRM_DW_HDMI_CEC + tristate "Synopsis Designware CEC interface" + depends on DRM_DW_HDMI + select CEC_CORE + select CEC_NOTIFIER + help + Support the CE interface which is part of the Synopsys + Designware HDMI block. + +config DRM_DW_MIPI_DSI + tristate + select DRM_KMS_HELPER + select DRM_MIPI_DSI + select DRM_PANEL_BRIDGE |