diff options
author | Olof Johansson <olof@lixom.net> | 2019-04-28 23:37:08 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-04-28 23:37:08 -0700 |
commit | 82b8118d0cd949237aa26d90c9cde5cbc3fd0d31 (patch) | |
tree | 46e65acaf4655b945b3f25f1efc9e6300f8f3338 /arch/arm64/configs | |
parent | 84260a4915beca1fa2bb4493e9fdedfe4cbdae4a (diff) | |
parent | bd9ae25314f275cea87a20db11756f32ed88dc15 (diff) | |
download | linux-stable-82b8118d0cd949237aa26d90c9cde5cbc3fd0d31.tar.gz linux-stable-82b8118d0cd949237aa26d90c9cde5cbc3fd0d31.tar.bz2 linux-stable-82b8118d0cd949237aa26d90c9cde5cbc3fd0d31.zip |
Merge tag 'tegra-for-5.2-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
arm64: tegra: Default configuration updates for v5.2-rc1
These patches enable PWM fan and Tegra HDA support in the 64-bit ARM
default configuration, so that these features are enabled by default.
* tag 'tegra-for-5.2-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
arm64: defconfig: Add PWM Fan support
arm64: defconfig: Enable Tegra HDA support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index a4a7acc5f8f4..755553f9c753 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -400,6 +400,7 @@ CONFIG_BATTERY_SBS=m CONFIG_BATTERY_BQ27XXX=y CONFIG_SENSORS_ARM_SCPI=y CONFIG_SENSORS_LM90=m +CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_SENSORS_INA2XX=m CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y @@ -512,6 +513,8 @@ CONFIG_LOGO=y # CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_SOUND=y CONFIG_SND=y +CONFIG_SND_HDA_TEGRA=m +CONFIG_SND_HDA_CODEC_HDMI=m CONFIG_SND_SOC=y CONFIG_SND_BCM2835_SOC_I2S=m CONFIG_SND_MESON_AXG_SOUND_CARD=m |