From patchwork Fri Feb 3 11:48:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 139358 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 55C51104797 for ; Fri, 3 Feb 2012 22:48:39 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RtHcy-0001AV-33; Fri, 03 Feb 2012 11:48:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1RtHcu-0001A8-D3 for kernel-team@lists.ubuntu.com; Fri, 03 Feb 2012 11:48:24 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1RtHcu-0006mB-9M for kernel-team@lists.ubuntu.com; Fri, 03 Feb 2012 11:48:24 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] ASoC: ABE - Fix L3 abort with Pulseaudio device capabilities check Date: Fri, 3 Feb 2012 12:48:22 +0100 Message-Id: <1328269702-6073-3-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1328269702-6073-1-git-send-email-paolo.pisati@canonical.com> References: <1328269702-6073-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Liam Girdwood 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 (cherry picked from http://dev.omapzoom.org/?p=integration%2Fkernel-ubuntu.git;a=commitdiff_plain;h=6606b5441992564bb69ac4c7a850643bd6e13bab) Signed-off-by: Paolo Pisati --- sound/soc/omap/omap-abe.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) 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,