From 8ca276428fa63711b1b87f3327bd9901c57cebe6 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Tue, 3 Mar 2009 16:10:51 +0100
Subject: [PATCH] --- yaml --- r: 132871 b: refs/heads/master c:
 aa4ef01de5f2e7ed948b88f9f1cfc93c8e0c3f25 h: refs/heads/master i:   132869:
 e9c01cb570b2fe598ce28e1c9e8a21348bb5d169   132867:
 c42f863c2264910159a78ce8f0e8dab897d4d33f   132863:
 6c9085178abd75d58cbfec5e90a66b5ad2140de5 v: v3

---
 [refs]                         | 2 +-
 trunk/sound/soc/pxa/pxa-ssp.c  | 3 +--
 trunk/sound/soc/pxa/zylonite.c | 7 +++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 01302b3b78ba..5e23aa9ee8ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef9e5e5c31cb2c6254760611289ac13e4e41b964
+refs/heads/master: aa4ef01de5f2e7ed948b88f9f1cfc93c8e0c3f25
diff --git a/trunk/sound/soc/pxa/pxa-ssp.c b/trunk/sound/soc/pxa/pxa-ssp.c
index 4a973ab710be..c49bb12b0a65 100644
--- a/trunk/sound/soc/pxa/pxa-ssp.c
+++ b/trunk/sound/soc/pxa/pxa-ssp.c
@@ -644,8 +644,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
 			sscr0 |= SSCR0_FPCKE;
 #endif
 		sscr0 |= SSCR0_DataSize(16);
-		if (params_channels(params) > 1)
-			sscr0 |= SSCR0_EDSS;
+		/* use network mode (2 slots) for 16 bit stereo */
 		break;
 	case SNDRV_PCM_FORMAT_S24_LE:
 		sscr0 |= (SSCR0_EDSS | SSCR0_DataSize(8));
diff --git a/trunk/sound/soc/pxa/zylonite.c b/trunk/sound/soc/pxa/zylonite.c
index 0140a250db24..9f6116edbb84 100644
--- a/trunk/sound/soc/pxa/zylonite.c
+++ b/trunk/sound/soc/pxa/zylonite.c
@@ -127,8 +127,11 @@ static int zylonite_voice_hw_params(struct snd_pcm_substream *substream,
 	if (ret < 0)
 		return ret;
 
-	/* We're not really in network mode but the emulation wants this. */
-	ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1);
+	/* Use network mode for stereo, one slot per channel. */
+	if (params_channels(params) > 1)
+		ret = snd_soc_dai_set_tdm_slot(cpu_dai, 0x3, 2);
+	else
+		ret = snd_soc_dai_set_tdm_slot(cpu_dai, 1, 1);
 	if (ret < 0)
 		return ret;