]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ARM: tegra: Update multi_v7_defconfig
authorThierry Reding <treding@nvidia.com>
Fri, 14 Aug 2015 14:17:52 +0000 (16:17 +0200)
committerThierry Reding <treding@nvidia.com>
Fri, 14 Aug 2015 14:26:00 +0000 (16:26 +0200)
Add Tegra-specific configuration options to multi_v7_defconfig:

  * HDA controller and codec support
  * Watchdog support
  * Nouveau (for GK20A GPU) support

Signed-off-by: Thierry Reding <treding@nvidia.com>
arch/arm/configs/multi_v7_defconfig

index 6d83a1bf0c7494593eb608ddba29f2bfea8d8455..01b7c68858e55859ea0ac1dc9c80fcd967a4898c 100644 (file)
@@ -371,6 +371,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_ST_LPC_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
+CONFIG_TEGRA_WATCHDOG=m
 CONFIG_MESON_WATCHDOG=y
 CONFIG_MFD_AS3711=y
 CONFIG_MFD_AS3722=y
@@ -430,8 +431,11 @@ CONFIG_VIDEO_RENESAS_VSP1=m
 CONFIG_VIDEO_ADV7180=m
 CONFIG_VIDEO_ML86V7667=m
 CONFIG_DRM=y
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
 CONFIG_DRM_PTN3460=m
 CONFIG_DRM_PS8622=m
+CONFIG_DRM_NOUVEAU=m
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_DSI=y
 CONFIG_DRM_EXYNOS_FIMD=y
@@ -455,6 +459,11 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 CONFIG_SOUND=m
 CONFIG_SND=m
 CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_HDA_TEGRA=m
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_HDMI=m
 CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=m
 CONFIG_SND_ATMEL_SOC=m