summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2017-07-10 15:28:17 +0200
committerSimon Horman <horms+renesas@verge.net.au>2017-07-27 16:06:22 +0200
commit9cfbc97d9931fa87c3dfc42174b46605d99c556b (patch)
tree8b8fdb510601ccacd5c9ff68e435396abd35c677 /arch/arm/configs
parentae9d60bb440295bdcf87274ff298c54b815f50f9 (diff)
downloadlinux-stable-9cfbc97d9931fa87c3dfc42174b46605d99c556b.tar.gz
linux-stable-9cfbc97d9931fa87c3dfc42174b46605d99c556b.tar.bz2
linux-stable-9cfbc97d9931fa87c3dfc42174b46605d99c556b.zip
ARM: shmobile: defconfig: Replace DRM_RCAR_HDMI by generic bridge options
The manual bridge implementation was removed in favor of the generic one, so now we need to enable standard bridge drivers like DRM_DUMB_VGA_DAC and DRM_I2C_ADV7511. DRM_I2C_ADV7511 was already enabled, but the (newer) audio part wasn't. Fixes: 5c602531feb3db39 ("drm: rcar-du: Replace manual bridge implementation with DRM bridge") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/shmobile_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index b0e4851e4186..378f6066ea70 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -155,10 +155,11 @@ CONFIG_VIDEO_ADV7180=y
CONFIG_VIDEO_ADV7604=y
CONFIG_VIDEO_ML86V7667=y
CONFIG_DRM=y
-CONFIG_DRM_I2C_ADV7511=y
CONFIG_DRM_RCAR_DU=y
-CONFIG_DRM_RCAR_HDMI=y
CONFIG_DRM_RCAR_LVDS=y
+CONFIG_DRM_DUMB_VGA_DAC=y
+CONFIG_DRM_I2C_ADV7511=y
+CONFIG_DRM_I2C_ADV7511_AUDIO=y
CONFIG_FB_SH_MOBILE_LCDC=y
CONFIG_FB_SH_MOBILE_MERAM=y
# CONFIG_LCD_CLASS_DEVICE is not set