From bbc9443a172f88ab91dd75e290ccf96430fb43cb Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Wed, 24 Aug 2011 10:39:09 +0100 Subject: [PATCH] --- yaml --- r: 270543 b: refs/heads/master c: 0933994df77607a07bfe3b562d66900175b8774e h: refs/heads/master i: 270541: 08a0b90230a4b14a8349f39a84af6dacee2621ad 270539: 194aa9015bf7d4f84df594cd99ea8112a094eb5f 270535: c22fc40c0eabb57d8780fe59efe1b5881ed3ee90 270527: e556bc56043b92ccaf9e1ba97b4be65abc32481a v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 1 + trunk/sound/soc/samsung/Kconfig | 1 + trunk/sound/soc/tegra/tegra_wm8903.c | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 49b5a5fecfa7..e45656e315cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78a262c87157bc049a1b08faf4762c606b24fed9 +refs/heads/master: 0933994df77607a07bfe3b562d66900175b8774e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 46e3e6b99220..4f555d8e5346 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -5532,6 +5532,7 @@ F: include/media/*7146* SAMSUNG AUDIO (ASoC) DRIVERS M: Jassi Brar +M: Sangbeom Kim L: alsa-devel@alsa-project.org (moderated for non-subscribers) S: Supported F: sound/soc/samsung diff --git a/trunk/sound/soc/samsung/Kconfig b/trunk/sound/soc/samsung/Kconfig index b99091fc34eb..65f980ef2870 100644 --- a/trunk/sound/soc/samsung/Kconfig +++ b/trunk/sound/soc/samsung/Kconfig @@ -185,6 +185,7 @@ config SND_SOC_SPEYSIDE select SND_SAMSUNG_I2S select SND_SOC_WM8996 select SND_SOC_WM9081 + select SND_SOC_WM1250_EV1 config SND_SOC_SPEYSIDE_WM8962 tristate "Audio support for Wolfson Speyside with WM8962" diff --git a/trunk/sound/soc/tegra/tegra_wm8903.c b/trunk/sound/soc/tegra/tegra_wm8903.c index 661373c2352a..be27f1d229af 100644 --- a/trunk/sound/soc/tegra/tegra_wm8903.c +++ b/trunk/sound/soc/tegra/tegra_wm8903.c @@ -319,7 +319,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); /* FIXME: Calculate automatically based on DAPM routes? */ - if (!machine_is_harmony() && !machine_is_ventana()) + if (!machine_is_harmony()) snd_soc_dapm_nc_pin(dapm, "IN1L"); if (!machine_is_seaboard() && !machine_is_aebl()) snd_soc_dapm_nc_pin(dapm, "IN1R"); @@ -395,7 +395,7 @@ static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) platform_set_drvdata(pdev, card); snd_soc_card_set_drvdata(card, machine); - if (machine_is_harmony() || machine_is_ventana()) { + if (machine_is_harmony()) { card->dapm_routes = harmony_audio_map; card->num_dapm_routes = ARRAY_SIZE(harmony_audio_map); } else if (machine_is_seaboard()) {