From: Thierry Reding Date: Tue, 20 Oct 2015 12:42:30 +0000 (+0200) Subject: ARM: tegra: Update multi_v7_defconfig X-Git-Tag: v4.4-rc1~50^2~2^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2fb43cecf5164fd99d0fd9fdd87f40e5148ecd91;p=linux.git ARM: tegra: Update multi_v7_defconfig Enable some options that have recently been enabled on Tegra platforms: * TOUCHSCREEN_WM97XX: touchscreen support on Toradex Colibri * SND_SOC_TEGRA_WM9712: audio support on Toradex Colibri Signed-off-by: Thierry Reding --- diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 03deb7fb35e8..333739c5161c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -245,6 +245,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=y CONFIG_TOUCHSCREEN_ST1232=m CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_SUN4I=y +CONFIG_TOUCHSCREEN_WM97XX=m CONFIG_INPUT_MISC=y CONFIG_INPUT_MPU3050=y CONFIG_INPUT_AXP20X_PEK=y @@ -485,6 +486,7 @@ CONFIG_SND_SOC_TEGRA=m CONFIG_SND_SOC_TEGRA_RT5640=m CONFIG_SND_SOC_TEGRA_WM8753=m CONFIG_SND_SOC_TEGRA_WM8903=m +CONFIG_SND_SOC_TEGRA_WM9712=m CONFIG_SND_SOC_TEGRA_TRIMSLICE=m CONFIG_SND_SOC_TEGRA_ALC5632=m CONFIG_SND_SOC_TEGRA_MAX98090=m