diff options
author | Thierry Reding <treding@nvidia.com> | 2015-05-05 14:20:16 +0200 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2015-05-05 14:20:16 +0200 |
commit | 5f9c2187d6cfac15b44b584c403e187321a4c062 (patch) | |
tree | 33c4709bc089cb5734cd262cfdb8ed5c69f79144 /arch/arm/configs/tegra_defconfig | |
parent | Linux 4.1-rc1 (diff) | |
download | linux-5f9c2187d6cfac15b44b584c403e187321a4c062.tar.xz linux-5f9c2187d6cfac15b44b584c403e187321a4c062.zip |
ARM: tegra: Update default configuration
Changes contributed by Marcel Ziswiler <marcel.ziswiler@toradex.com>:
Enable HDA to support audio over HDMI and codecs connected to the HDA
controller (needed by the Toradex Apalis Tegra30 Evaluation Board):
- SND_HDA
- SND_HDA_TEGRA
- SND_HDA_INPUT_BEEP
- SND_HDA_INPUT_JACK
- SND_HDA_PATCH_LOADER
- SND_HDA_CODEC_REALTEK
- SND_HDA_CODEC_HDMI
- SND_HDA_GENERIC
Enable watchdog support:
- WATCHDOG
- TEGRA_WATCHDOG
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/configs/tegra_defconfig')
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index d199eb249151..cdf9abb46015 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -154,6 +154,8 @@ CONFIG_POWER_RESET_AS3722=y CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM95245=y +CONFIG_WATCHDOG=y +CONFIG_TEGRA_WATCHDOG=y CONFIG_MFD_AS3722=y CONFIG_MFD_CROS_EC=y CONFIG_MFD_CROS_EC_SPI=y @@ -194,6 +196,14 @@ CONFIG_SOUND=y CONFIG_SND=y # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_DRIVERS is not set +CONFIG_SND_HDA=y +CONFIG_SND_HDA_TEGRA=y +CONFIG_SND_HDA_INPUT_BEEP=y +CONFIG_SND_HDA_INPUT_JACK=y +CONFIG_SND_HDA_PATCH_LOADER=y +CONFIG_SND_HDA_CODEC_REALTEK=y +CONFIG_SND_HDA_CODEC_HDMI=y +CONFIG_SND_HDA_GENERIC=y # CONFIG_SND_ARM is not set # CONFIG_SND_SPI is not set # CONFIG_SND_USB is not set |