From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?R2HDq3RhbiBDYXJsaWVy?= Subject: Re: [ASoC] Fix: Revert 'ASoC: imx-ssi: Remove mono support'. Date: Tue, 04 Sep 2012 08:35:07 +0200 Message-ID: <5045A11B.3070300@gmail.com> References: <1346660831-9662-1-git-send-email-javier.martin@vista-silicon.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by alsa0.perex.cz (Postfix) with ESMTP id A215126523F for ; Tue, 4 Sep 2012 08:36:07 +0200 (CEST) Received: by wibhm6 with SMTP id hm6so3637093wib.2 for ; Mon, 03 Sep 2012 23:36:07 -0700 (PDT) In-Reply-To: <1346660831-9662-1-git-send-email-javier.martin@vista-silicon.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Javier Martin Cc: fabio.estevam@freescale.com, alsa-devel@alsa-project.org, broonie@opensource.wolfsonmicro.com, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org List-Id: alsa-devel@alsa-project.org SGkgSmF2aWVyLApPbiAwOS8wMy8yMDEyIDEwOjI3IEFNLCBKYXZpZXIgTWFydGluIHdyb3RlOgo+ IFRoZSBmb2xsb3dpbmcgY29tbWl0IHNob3VsZCBiZSByZXZlcnRlZDogMDg2NWE3NWQ0MTY2YmRk YzUzM2ZkNTA4MzE4MjljZWVmYjk0ZjliMAo+Cj4gVGhlIGJ1ZyB0aGlzIHBhdGNoIGlzIG1lYW50 IHRvIHNvbHZlIGRvZXNuJ3Qgb2NjdXIgaW4gVmlzc3RyaW1fTTEwIGJvYXJkcy4KPiBGdXJ0aGVy bW9yZSwgYWZ0ZXIgYXBwbHlpbmcgdGhpcyBwYXRjaCBzb3VuZCBpbiBWaXNzdHJpbV9NMTAgaXMg cGxheWVkCj4gYXQgc2xvd2VyIHJhdGVzLgo+Cj4gU2lnbmVkLW9mZi1ieTogSmF2aWVyIE1hcnRp biA8amF2aWVyLm1hcnRpbkB2aXN0YS1zaWxpY29uLmNvbT4KPiAtLS0KPiBkaWZmIC0tZ2l0IGIv c291bmQvc29jL2ZzbC9pbXgtc3NpLmMgYS9zb3VuZC9zb2MvZnNsL2lteC1zc2kuYwo+IGluZGV4 IGFjMzM3YWMuLjI4ZGQ3NmMgMTAwNjQ0Cj4gLS0tIGIvc291bmQvc29jL2ZzbC9pbXgtc3NpLmMK PiArKysgYS9zb3VuZC9zb2MvZnNsL2lteC1zc2kuYwo+IEBAIC0zODAsMTMgKzM4MCwxMyBAQCBz dGF0aWMgaW50IGlteF9zc2lfZGFpX3Byb2JlKHN0cnVjdCBzbmRfc29jX2RhaSAqZGFpKQo+ICAg c3RhdGljIHN0cnVjdCBzbmRfc29jX2RhaV9kcml2ZXIgaW14X3NzaV9kYWkgPSB7Cj4gICAJLnBy b2JlID0gaW14X3NzaV9kYWlfcHJvYmUsCj4gICAJLnBsYXliYWNrID0gewo+IC0JCS5jaGFubmVs c19taW4gPSAyLAo+ICsJCS5jaGFubmVsc19taW4gPSAxLAo+ICAgCQkuY2hhbm5lbHNfbWF4ID0g MiwKPiAgIAkJLnJhdGVzID0gU05EUlZfUENNX1JBVEVfODAwMF85NjAwMCwKPiAgIAkJLmZvcm1h dHMgPSBTTkRSVl9QQ01fRk1UQklUX1MxNl9MRSwKPiAgIAl9LAo+ICAgCS5jYXB0dXJlID0gewo+ IC0JCS5jaGFubmVsc19taW4gPSAyLAo+ICsJCS5jaGFubmVsc19taW4gPSAxLAo+ICAgCQkuY2hh bm5lbHNfbWF4ID0gMiwKPiAgIAkJLnJhdGVzID0gU05EUlZfUENNX1JBVEVfODAwMF85NjAwMCwK PiAgIAkJLmZvcm1hdHMgPSBTTkRSVl9QQ01fRk1UQklUX1MxNl9MRSwKPgpXaGVuIGFwcGxpZWQg b24gbGludXgtbmV4dC0yMDEyMDgyNCwgdGhlIHBhdGNoIGZhaWxlZCBiZWNhdXNlIG9yaWdpbmFs IAppbXgtc3NpLmMgZmlsZSBsb29rcyBsaWtlIDoKc3RhdGljIHN0cnVjdCBzbmRfc29jX2RhaV9k cml2ZXIgaW14X3NzaV9kYWkgPSB7CgkucHJvYmUgPSBpbXhfc3NpX2RhaV9wcm9iZSwKCS5wbGF5 YmFjayA9IHsKCQkvKiBUaGUgU1NJIGRvZXMgbm90IHN1cHBvcnQgbW9uYXVyYWwgYXVkaW8uICov CgkJLmNoYW5uZWxzX21pbiA9IDIsCgkJLmNoYW5uZWxzX21heCA9IDIsCgkJLnJhdGVzID0gU05E UlZfUENNX1JBVEVfODAwMF85NjAwMCwKCQkuZm9ybWF0cyA9IFNORFJWX1BDTV9GTVRCSVRfUzE2 X0xFLAoJfSwKCS5jYXB0dXJlID0gewoJCS5jaGFubmVsc19taW4gPSAyLAoJCS5jaGFubmVsc19t YXggPSAyLAoJCS5yYXRlcyA9IFNORFJWX1BDTV9SQVRFXzgwMDBfOTYwMDAsCgkJLmZvcm1hdHMg PSBTTkRSVl9QQ01fRk1UQklUX1MxNl9MRSwKCX0sCgkub3BzID0gJmlteF9zc2lfcGNtX2RhaV9v cHMsCn07CgpUaGUgY29tbWVudCBsaW5lIGlzIG1pc3NpbmcgaW4geW91ciBwYXRjaC4gSGVyZSBp cyB0aGUgcmlnaHQgcGF0Y2ggOgoKQEAgLTM3OCwxOCArMzc4LDE3IEBAIHN0YXRpYyBpbnQgaW14 X3NzaV9kYWlfcHJvYmUoc3RydWN0IHNuZF9zb2NfZGFpICpkYWkpCiAgfQoKICBzdGF0aWMgc3Ry dWN0IHNuZF9zb2NfZGFpX2RyaXZlciBpbXhfc3NpX2RhaSA9IHsKICAJLnByb2JlID0gaW14X3Nz aV9kYWlfcHJvYmUsCiAgCS5wbGF5YmFjayA9IHsKLQkJLyogVGhlIFNTSSBkb2VzIG5vdCBzdXBw b3J0IG1vbmF1cmFsIGF1ZGlvLiAqLwotCQkuY2hhbm5lbHNfbWluID0gMiwKKwkJLmNoYW5uZWxz X21pbiA9IDEsCiAgCQkuY2hhbm5lbHNfbWF4ID0gMiwKICAJCS5yYXRlcyA9IFNORFJWX1BDTV9S QVRFXzgwMDBfOTYwMDAsCiAgCQkuZm9ybWF0cyA9IFNORFJWX1BDTV9GTVRCSVRfUzE2X0xFLAog IAl9LAogIAkuY2FwdHVyZSA9IHsKLQkJLmNoYW5uZWxzX21pbiA9IDIsCisJCS5jaGFubmVsc19t aW4gPSAxLAogIAkJLmNoYW5uZWxzX21heCA9IDIsCiAgCQkucmF0ZXMgPSBTTkRSVl9QQ01fUkFU RV84MDAwXzk2MDAwLAogIAkJLmZvcm1hdHMgPSBTTkRSVl9QQ01fRk1UQklUX1MxNl9MRSwKICAJ fSwKICAJLm9wcyA9ICZpbXhfc3NpX3BjbV9kYWlfb3BzLAoKUmVnYXJkcywKR2HDq3RhbiBDYXJs aWVyLgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBbHNh LWRldmVsIG1haWxpbmcgbGlzdApBbHNhLWRldmVsQGFsc2EtcHJvamVjdC5vcmcKaHR0cDovL21h aWxtYW4uYWxzYS1wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Fsc2EtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754621Ab2IDGgK (ORCPT ); Tue, 4 Sep 2012 02:36:10 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:41148 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751172Ab2IDGgI (ORCPT ); Tue, 4 Sep 2012 02:36:08 -0400 Message-ID: <5045A11B.3070300@gmail.com> Date: Tue, 04 Sep 2012 08:35:07 +0200 From: =?UTF-8?B?R2HDq3RhbiBDYXJsaWVy?= User-Agent: Mozilla/5.0 (X11; Linux i686; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: Javier Martin CC: linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, broonie@opensource.wolfsonmicro.com, fabio.estevam@freescale.com, s.hauer@pengutronix.de Subject: Re: [ASoC] Fix: Revert 'ASoC: imx-ssi: Remove mono support'. References: <1346660831-9662-1-git-send-email-javier.martin@vista-silicon.com> In-Reply-To: <1346660831-9662-1-git-send-email-javier.martin@vista-silicon.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Javier, On 09/03/2012 10:27 AM, Javier Martin wrote: > The following commit should be reverted: 0865a75d4166bddc533fd50831829ceefb94f9b0 > > The bug this patch is meant to solve doesn't occur in Visstrim_M10 boards. > Furthermore, after applying this patch sound in Visstrim_M10 is played > at slower rates. > > Signed-off-by: Javier Martin > --- > diff --git b/sound/soc/fsl/imx-ssi.c a/sound/soc/fsl/imx-ssi.c > index ac337ac..28dd76c 100644 > --- b/sound/soc/fsl/imx-ssi.c > +++ a/sound/soc/fsl/imx-ssi.c > @@ -380,13 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai) > static struct snd_soc_dai_driver imx_ssi_dai = { > .probe = imx_ssi_dai_probe, > .playback = { > - .channels_min = 2, > + .channels_min = 1, > .channels_max = 2, > .rates = SNDRV_PCM_RATE_8000_96000, > .formats = SNDRV_PCM_FMTBIT_S16_LE, > }, > .capture = { > - .channels_min = 2, > + .channels_min = 1, > .channels_max = 2, > .rates = SNDRV_PCM_RATE_8000_96000, > .formats = SNDRV_PCM_FMTBIT_S16_LE, > When applied on linux-next-20120824, the patch failed because original imx-ssi.c file looks like : static struct snd_soc_dai_driver imx_ssi_dai = { .probe = imx_ssi_dai_probe, .playback = { /* The SSI does not support monaural audio. */ .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .capture = { .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .ops = &imx_ssi_pcm_dai_ops, }; The comment line is missing in your patch. Here is the right patch : @@ -378,18 +378,17 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai) } static struct snd_soc_dai_driver imx_ssi_dai = { .probe = imx_ssi_dai_probe, .playback = { - /* The SSI does not support monaural audio. */ - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .capture = { - .channels_min = 2, + .channels_min = 1, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_96000, .formats = SNDRV_PCM_FMTBIT_S16_LE, }, .ops = &imx_ssi_pcm_dai_ops, Regards, Gaëtan Carlier.