---

yaml
---
r: 132871
b: refs/heads/master
c: aa4ef01
h: refs/heads/master
i:
  132869: e9c01cb
  132867: c42f863
  132863: 6c90851
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef9e5e5c31cb2c6254760611289ac13e4e41b964
+refs/heads/master: aa4ef01de5f2e7ed948b88f9f1cfc93c8e0c3f25

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));

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;