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

Commit c2c73aa8 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-defconfig2-for-v4.4' of... 

Merge tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig

Second Round of Renesas ARM Based SoC Defconfig Updates for v4.4

* Enable HDMI output for Renesas RCar

* tag 'renesas-defconfig2-for-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: multi_v7_defconfig: enable HDMI output for Renesas RCar
  ARM: shmobile: defconfig: enable HDMI output for RCar

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7c83d2f7 fec3fb47

arch/arm/configs/multi_v7_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -455,6 +455,7 @@ CONFIG_VIDEO_RENESAS_VSP1=m 
CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_ML86V7667=m

CONFIG_DRM=y

CONFIG_DRM_I2C_ADV7511=m

# CONFIG_DRM_I2C_CH7006 is not set

# CONFIG_DRM_I2C_SIL164 is not set

CONFIG_DRM_NXP_PTN3460=m
@@ -467,6 +468,8 @@ CONFIG_DRM_EXYNOS_HDMI=y 
CONFIG_DRM_ROCKCHIP=m

CONFIG_ROCKCHIP_DW_HDMI=m

CONFIG_DRM_RCAR_DU=m

CONFIG_DRM_RCAR_HDMI=y

CONFIG_DRM_RCAR_LVDS=y

CONFIG_DRM_TEGRA=y

CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m

CONFIG_DRM_PANEL_SIMPLE=y

arch/arm/configs/shmobile_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -140,7 +140,10 @@ CONFIG_VIDEO_RENESAS_VSP1=y 
CONFIG_VIDEO_ADV7180=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_FB_SH_MOBILE_LCDC=y

CONFIG_FB_SH_MOBILE_MERAM=y

# CONFIG_LCD_CLASS_DEVICE is not set