diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-22 09:46:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-22 09:46:49 -0700 |
| commit | c2c73aa8593b9996b9b6f85daf21956c7d655fb6 (patch) | |
| tree | f388c8313c51427310784d1dc44f29b81c2e775c /arch/arm/configs | |
| parent | 7c83d2f79ec61590907f466787d8199ad0669beb (diff) | |
| parent | fec3fb4734b4d2c33975077c250ebd4a3a9f8e34 (diff) | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 3 | ||||
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a992c510723c..d3fc04007cf5 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 0bdeb4925be4..3aef019c0de7 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -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 |