diff options
author | Thierry Reding <treding@nvidia.com> | 2015-08-14 10:17:52 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2015-08-14 10:26:00 -0400 |
commit | 258d9bc5e77fa40e290a0bd480d5349224374480 (patch) | |
tree | 4bf3546c93df1f6dcb50c3d79f5f562ff7f4531b | |
parent | 461cfe4e2f5d000f76a38fb7cefd2fedf42c9026 (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_defconfig | 9 |
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 | |||
371 | CONFIG_ORION_WATCHDOG=y | 371 | CONFIG_ORION_WATCHDOG=y |
372 | CONFIG_ST_LPC_WATCHDOG=y | 372 | CONFIG_ST_LPC_WATCHDOG=y |
373 | CONFIG_SUNXI_WATCHDOG=y | 373 | CONFIG_SUNXI_WATCHDOG=y |
374 | CONFIG_TEGRA_WATCHDOG=m | ||
374 | CONFIG_MESON_WATCHDOG=y | 375 | CONFIG_MESON_WATCHDOG=y |
375 | CONFIG_MFD_AS3711=y | 376 | CONFIG_MFD_AS3711=y |
376 | CONFIG_MFD_AS3722=y | 377 | CONFIG_MFD_AS3722=y |
@@ -430,8 +431,11 @@ CONFIG_VIDEO_RENESAS_VSP1=m | |||
430 | CONFIG_VIDEO_ADV7180=m | 431 | CONFIG_VIDEO_ADV7180=m |
431 | CONFIG_VIDEO_ML86V7667=m | 432 | CONFIG_VIDEO_ML86V7667=m |
432 | CONFIG_DRM=y | 433 | CONFIG_DRM=y |
434 | # CONFIG_DRM_I2C_CH7006 is not set | ||
435 | # CONFIG_DRM_I2C_SIL164 is not set | ||
433 | CONFIG_DRM_PTN3460=m | 436 | CONFIG_DRM_PTN3460=m |
434 | CONFIG_DRM_PS8622=m | 437 | CONFIG_DRM_PS8622=m |
438 | CONFIG_DRM_NOUVEAU=m | ||
435 | CONFIG_DRM_EXYNOS=m | 439 | CONFIG_DRM_EXYNOS=m |
436 | CONFIG_DRM_EXYNOS_DSI=y | 440 | CONFIG_DRM_EXYNOS_DSI=y |
437 | CONFIG_DRM_EXYNOS_FIMD=y | 441 | CONFIG_DRM_EXYNOS_FIMD=y |
@@ -455,6 +459,11 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | |||
455 | CONFIG_SOUND=m | 459 | CONFIG_SOUND=m |
456 | CONFIG_SND=m | 460 | CONFIG_SND=m |
457 | CONFIG_SND_DYNAMIC_MINORS=y | 461 | CONFIG_SND_DYNAMIC_MINORS=y |
462 | CONFIG_SND_HDA_TEGRA=m | ||
463 | CONFIG_SND_HDA_INPUT_BEEP=y | ||
464 | CONFIG_SND_HDA_PATCH_LOADER=y | ||
465 | CONFIG_SND_HDA_CODEC_REALTEK=m | ||
466 | CONFIG_SND_HDA_CODEC_HDMI=m | ||
458 | CONFIG_SND_USB_AUDIO=y | 467 | CONFIG_SND_USB_AUDIO=y |
459 | CONFIG_SND_SOC=m | 468 | CONFIG_SND_SOC=m |
460 | CONFIG_SND_ATMEL_SOC=m | 469 | CONFIG_SND_ATMEL_SOC=m |