aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-08-14 10:17:52 -0400
committerThierry Reding <treding@nvidia.com>2015-08-14 10:26:00 -0400
commit258d9bc5e77fa40e290a0bd480d5349224374480 (patch)
tree4bf3546c93df1f6dcb50c3d79f5f562ff7f4531b
parent461cfe4e2f5d000f76a38fb7cefd2fedf42c9026 (diff)
ARM: tegra: Update multi_v7_defconfig
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>
-rw-r--r--arch/arm/configs/multi_v7_defconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6d83a1bf0c74..01b7c68858e5 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -371,6 +371,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
371CONFIG_ORION_WATCHDOG=y 371CONFIG_ORION_WATCHDOG=y
372CONFIG_ST_LPC_WATCHDOG=y 372CONFIG_ST_LPC_WATCHDOG=y
373CONFIG_SUNXI_WATCHDOG=y 373CONFIG_SUNXI_WATCHDOG=y
374CONFIG_TEGRA_WATCHDOG=m
374CONFIG_MESON_WATCHDOG=y 375CONFIG_MESON_WATCHDOG=y
375CONFIG_MFD_AS3711=y 376CONFIG_MFD_AS3711=y
376CONFIG_MFD_AS3722=y 377CONFIG_MFD_AS3722=y
@@ -430,8 +431,11 @@ CONFIG_VIDEO_RENESAS_VSP1=m
430CONFIG_VIDEO_ADV7180=m 431CONFIG_VIDEO_ADV7180=m
431CONFIG_VIDEO_ML86V7667=m 432CONFIG_VIDEO_ML86V7667=m
432CONFIG_DRM=y 433CONFIG_DRM=y
434# CONFIG_DRM_I2C_CH7006 is not set
435# CONFIG_DRM_I2C_SIL164 is not set
433CONFIG_DRM_PTN3460=m 436CONFIG_DRM_PTN3460=m
434CONFIG_DRM_PS8622=m 437CONFIG_DRM_PS8622=m
438CONFIG_DRM_NOUVEAU=m
435CONFIG_DRM_EXYNOS=m 439CONFIG_DRM_EXYNOS=m
436CONFIG_DRM_EXYNOS_DSI=y 440CONFIG_DRM_EXYNOS_DSI=y
437CONFIG_DRM_EXYNOS_FIMD=y 441CONFIG_DRM_EXYNOS_FIMD=y
@@ -455,6 +459,11 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
455CONFIG_SOUND=m 459CONFIG_SOUND=m
456CONFIG_SND=m 460CONFIG_SND=m
457CONFIG_SND_DYNAMIC_MINORS=y 461CONFIG_SND_DYNAMIC_MINORS=y
462CONFIG_SND_HDA_TEGRA=m
463CONFIG_SND_HDA_INPUT_BEEP=y
464CONFIG_SND_HDA_PATCH_LOADER=y
465CONFIG_SND_HDA_CODEC_REALTEK=m
466CONFIG_SND_HDA_CODEC_HDMI=m
458CONFIG_SND_USB_AUDIO=y 467CONFIG_SND_USB_AUDIO=y
459CONFIG_SND_SOC=m 468CONFIG_SND_SOC=m
460CONFIG_SND_ATMEL_SOC=m 469CONFIG_SND_ATMEL_SOC=m