From: Olof Johansson Date: Mon, 29 Apr 2019 06:37:08 +0000 (-0700) Subject: Merge tag 'tegra-for-5.2-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kerne... X-Git-Tag: v5.15~6341^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82b8118d0cd949237aa26d90c9cde5cbc3fd0d31;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'tegra-for-5.2-arm64-defconfig' of git://git./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 --- 82b8118d0cd949237aa26d90c9cde5cbc3fd0d31 diff --cc arch/arm64/configs/defconfig index a4a7acc,e578b12..755553f --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -512,9 -523,10 +513,11 @@@ CONFIG_LOGO= # 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 CONFIG_SND_SOC_ROCKCHIP=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m CONFIG_SND_SOC_ROCKCHIP_RT5645=m