Patchwork [2/2] ASoC: ABE - Fix L3 abort with Pulseaudio device capabilities check

login
register
mail settings
Submitter Paolo Pisati
Date Feb. 3, 2012, 11:48 a.m.
Message ID <1328269702-6073-3-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/139358/
State New
Headers show

Comments

Paolo Pisati - Feb. 3, 2012, 11:48 a.m.
From: Liam Girdwood <lrg@ti.com>

ASoC: ABE - Fix L3 abort with Pulseaudio device capabilities check

The ABE currently does not support 16bit mono on any of it's DAIs as it
can only internally access data on 4 byte boundaries.

Ensure that this requirement is enforced. Mono support was only required
for Android (as a temporary workaround).

Back ported from 3.3 HEAD.

Signed-off-by: Liam Girdwood <lrg@ti.com>

(cherry picked from http://dev.omapzoom.org/?p=integration%2Fkernel-ubuntu.git;a=commitdiff_plain;h=6606b5441992564bb69ac4c7a850643bd6e13bab)

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 sound/soc/omap/omap-abe.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

Patch

diff --git a/sound/soc/omap/omap-abe.c b/sound/soc/omap/omap-abe.c
index 83e1204..a30d278 100644
--- a/sound/soc/omap/omap-abe.c
+++ b/sound/soc/omap/omap-abe.c
@@ -1448,7 +1448,7 @@  static struct snd_soc_dai_driver omap_abe_dai[] = {
 		.resume = omap_abe_dai_resume,
 		.playback = {
 			.stream_name = "MultiMedia1 Playback",
-			.channels_min = 1,
+			.channels_min = 2,
 			.channels_max = 2,
 			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100,
 			.formats = OMAP_ABE_FORMATS,
@@ -1470,7 +1470,7 @@  static struct snd_soc_dai_driver omap_abe_dai[] = {
 		.resume = omap_abe_dai_resume,
 		.capture = {
 			.stream_name = "MultiMedia2 Capture",
-			.channels_min = 1,
+			.channels_min = 2,
 			.channels_max = 2,
 			.rates = SNDRV_PCM_RATE_48000,
 			.formats = OMAP_ABE_FORMATS,
@@ -1485,14 +1485,14 @@  static struct snd_soc_dai_driver omap_abe_dai[] = {
 		.resume = omap_abe_dai_resume,
 		.playback = {
 			.stream_name = "Voice Playback",
-			.channels_min = 1,
+			.channels_min = 2,
 			.channels_max = 2,
 			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,
 			.formats = OMAP_ABE_FORMATS,
 		},
 		.capture = {
 			.stream_name = "Voice Capture",
-			.channels_min = 1,
+			.channels_min = 2,
 			.channels_max = 2,
 			.rates = SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000,
 			.formats = OMAP_ABE_FORMATS,
@@ -1507,7 +1507,7 @@  static struct snd_soc_dai_driver omap_abe_dai[] = {
 		.resume = omap_abe_dai_resume,
 		.playback = {
 			.stream_name = "Tones Playback",
-			.channels_min = 1,
+			.channels_min = 2,
 			.channels_max = 2,
 			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100,
 			.formats = OMAP_ABE_FORMATS,