commit e3c51ca8fa4a0f3f13ba9be80bee2708cd723934
author Mark Brown <broonie@linaro.org> Tue Sep 17 00:50:44 2013 +0100
committer Mark Brown <broonie@linaro.org> Tue Sep 17 00:50:44 2013 +0100
tree 2fb9e21dd07ef066be1ce7291312c65c967a7710
parent b3a6006e1d106fddcfc121d0ccfa9b7faeeb8f3e
parent 0e4ff5c806263bf40ee5409ac283b776f0c11e41

Merge remote-tracking branch 'asoc/topic/devm' into asoc-samsung

sound/soc/samsung/bells.c

diff --git a/sound/soc/samsung/bells.c b/sound/soc/samsung/bells.c
index 29e2468..84f5d8b 100644
--- a/sound/soc/samsung/bells.c
+++ b/sound/soc/samsung/bells.c
@@ -356,6 +356,7 @@
 
 static struct snd_soc_dapm_route bells_routes[] = {
 	{ "Sub CLK_SYS", NULL, "OPCLK" },
+	{ "CLKIN", NULL, "OPCLK" },
 
 	{ "DMIC", NULL, "MICBIAS2" },
 	{ "IN2L", NULL, "DMIC" },

sound/soc/samsung/i2s.c

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index b302f3b..a7e3519 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -1060,7 +1060,7 @@
 	i2s->i2s_dai_drv.ops = &samsung_i2s_dai_ops;
 	i2s->i2s_dai_drv.suspend = i2s_suspend;
 	i2s->i2s_dai_drv.resume = i2s_resume;
-	i2s->i2s_dai_drv.playback.channels_min = 2;
+	i2s->i2s_dai_drv.playback.channels_min = 1;
 	i2s->i2s_dai_drv.playback.channels_max = 2;
 	i2s->i2s_dai_drv.playback.rates = SAMSUNG_I2S_RATES;
 	i2s->i2s_dai_drv.playback.formats = SAMSUNG_I2S_FMTS;