From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lars-Peter Clausen <lars@metafoo.de>
Subject: Re: [PATCH 10/17] ASoC: mxs: Use generic dmaengine PCM
Date: Thu, 18 Apr 2013 11:04:38 +0200
Message-ID: <516FB726.4080304@metafoo.de>
References: <1366046404-8759-1-git-send-email-lars@metafoo.de>
 <1366046404-8759-11-git-send-email-lars@metafoo.de>
 <20130417084304.GK11245@S2101-09.ap.freescale.net>
 <516E6B2B.5000805@metafoo.de>
 <20130417135003.GA20563@S2101-09.ap.freescale.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <alsa-devel-bounces@alsa-project.org>
Received: from smtp-out-165.synserver.de (smtp-out-170.synserver.de
 [212.40.185.170])
 by alsa0.perex.cz (Postfix) with ESMTP id E14EE265E1A
 for <alsa-devel@alsa-project.org>; Thu, 18 Apr 2013 11:05:23 +0200 (CEST)
In-Reply-To: <20130417135003.GA20563@S2101-09.ap.freescale.net>
List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe>
List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/>
List-Post: <mailto:alsa-devel@alsa-project.org>
List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help>
List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>,
 <mailto:alsa-devel-request@alsa-project.org?subject=subscribe>
Errors-To: alsa-devel-bounces@alsa-project.org
Sender: alsa-devel-bounces@alsa-project.org
To: Shawn Guo <shawn.guo@linaro.org>
Cc: Ola Lilja <ola.o.lilja@stericsson.com>, alsa-devel@alsa-project.org, Rajeev Kumar <rajeev-dlh.kumar@st.com>, Russell King <linux@arm.linux.org.uk>, Ryan Mallon <rmallon@gmail.com>, Stephen Warren <swarren@wwwdotorg.org>, Vinod Koul <vinod.koul@intel.com>, Liam Girdwood <lgirdwood@gmail.com>, Peter Ujfalusi <peter.ujfalusi@ti.com>, Hartley Sweeten <hsweeten@visionengravers.com>, Mark Brown <broonie@kernel.org>, Laxman Dewangan <ldewangan@nvidia.com>, Sebastien Guiriec <s-guiriec@ti.com>, Markus Pargmann <mpa@pengutronix.de>, Lee Jones <lee.jones@linaro.org>, Jarkko Nikula <jarkko.nikula@bitmer.com>
List-Id: alsa-devel@alsa-project.org

On 04/17/2013 03:50 PM, Shawn Guo wrote:
> On Wed, Apr 17, 2013 at 11:28:11AM +0200, Lars-Peter Clausen wrote:
>> Can you see whether the patch below fixes it?
>>
> No, it does not fix the problem.
> 
> Shawn

Could you try the other patch plus this one:

--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2018,9 +2018,11 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 		if (cpu_dai->driver->capture.channels_min)
 			capture = 1;
 	} else {
-		if (codec_dai->driver->playback.channels_min)
+		if (codec_dai->driver->playback.channels_min &&
+			cpu_dai->driver->playback.channels_min)
 			playback = 1;
-		if (codec_dai->driver->capture.channels_min)
+		if (codec_dai->driver->capture.channels_min &&
+			cpu_dai->driver->capture.channels_min)
 			capture = 1;
 	}

> 
>> diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c
>> index b563141..675c348 100644
>> --- a/sound/soc/mxs/mxs-saif.c
>> +++ b/sound/soc/mxs/mxs-saif.c
>> @@ -611,21 +611,28 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai)
>>  }
>>
>>  static struct snd_soc_dai_driver mxs_saif_dai = {
>> -	.name = "mxs-saif",
>> -	.probe = mxs_saif_dai_probe,
>> -	.playback = {
>> -		.channels_min = 2,
>> -		.channels_max = 2,
>> -		.rates = MXS_SAIF_RATES,
>> -		.formats = MXS_SAIF_FORMATS,
>> +	{
>> +		.name = "mxs-saif",
>> +		.probe = mxs_saif_dai_probe,
>> +		.playback = {
>> +			.channels_min = 2,
>> +			.channels_max = 2,
>> +			.rates = MXS_SAIF_RATES,
>> +			.formats = MXS_SAIF_FORMATS,
>> +		},
>> +		.ops = &mxs_saif_dai_ops,
>>  	},
>> -	.capture = {
>> -		.channels_min = 2,
>> -		.channels_max = 2,
>> -		.rates = MXS_SAIF_RATES,
>> -		.formats = MXS_SAIF_FORMATS,
>> +	{
>> +		.name = "mxs-saif",
>> +		.probe = mxs_saif_dai_probe,
>> +		.capture = {
>> +			.channels_min = 2,
>> +			.channels_max = 2,
>> +			.rates = MXS_SAIF_RATES,
>> +			.formats = MXS_SAIF_FORMATS,
>> +		},
>> +		.ops = &mxs_saif_dai_ops,
>>  	},
>> -	.ops = &mxs_saif_dai_ops,
>>  };
>>
>>  static const struct snd_soc_component_driver mxs_saif_component = {
>> @@ -769,7 +776,7 @@ static int mxs_saif_probe(struct platform_device *pdev)
>>  	platform_set_drvdata(pdev, saif);
>>
>>  	ret = snd_soc_register_component(&pdev->dev, &mxs_saif_component,
>> -					 &mxs_saif_dai, 1);
>> +					 &mxs_saif_dai[saif->id], 1);
>>  	if (ret) {
>>  		dev_err(&pdev->dev, "register DAI failed\n");
>>  		return ret;
>