From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean-Francois Moine Subject: [PATCH] ASoC: kirkwood: Fix the CPU DAI rates Date: Wed, 27 Nov 2013 21:10:24 +0100 Message-ID: <20131127211024.52e5ae1b@armhf> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from smtp4-g21.free.fr (smtp4-g21.free.fr [212.27.42.4]) by alsa0.perex.cz (Postfix) with ESMTP id 74E7F2651A4 for ; Wed, 27 Nov 2013 21:08:13 +0100 (CET) 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: linux-arm-kernel@lists.infradead.org, alsa-devel@alsa-project.org Cc: Mark Brown , Liam Girdwood List-Id: alsa-devel@alsa-project.org VGhpcyBwYXRjaCBmaXhlcyB0aGUgcmF0ZXMgZGVjbGFyZWQgaW4gdGhlIENQVSBEQUkgcGFyYW1l dGVyczoKLSBTTkRSVl9QQ01fUkFURV9LTk9UIGFuZCB0aGUgZGlzY3JldGUgcmF0ZXMgU05EUlZf UENNX1JBVEVfeHh4IHNob3VsZAogIG5vdCBiZSB1c2VkIHdpdGggU05EUlZfUENNX1JBVEVfQ09O VElOVU9VUywKLSBTTkRSVl9QQ01fUkFURV9DT05USU5VT1VTIGFza3MgZm9yIHJhdGVfbWluIGFu ZCByYXRlX21heCwKLSB0aGUgZGV2aWNlIG1heSBkbyBzdHJlYW1pbmcgZG93biB0byA1NTEySHou CgpTaWduZWQtb2ZmLWJ5OiBKZWFuLUZyYW5jb2lzIE1vaW5lIDxtb2luZWpmQGZyZWUuZnI+Ci0t LQogc291bmQvc29jL2tpcmt3b29kL2tpcmt3b29kLWkycy5jIHwgMjQgKysrKysrKysrKystLS0t LS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDEyIGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL3NvdW5kL3NvYy9raXJrd29vZC9raXJrd29vZC1pMnMuYyBiL3NvdW5k L3NvYy9raXJrd29vZC9raXJrd29vZC1pMnMuYwppbmRleCAwYjE4ZjY1Li4zOTIwYTVlIDEwMDY0 NAotLS0gYS9zb3VuZC9zb2Mva2lya3dvb2Qva2lya3dvb2QtaTJzLmMKKysrIGIvc291bmQvc29j L2tpcmt3b29kL2tpcmt3b29kLWkycy5jCkBAIC00NzMsMTcgKzQ3MywxNyBAQCBzdGF0aWMgc3Ry dWN0IHNuZF9zb2NfZGFpX2RyaXZlciBraXJrd29vZF9pMnNfZGFpX2V4dGNsa1syXSA9IHsKIAku cGxheWJhY2sgPSB7CiAJCS5jaGFubmVsc19taW4gPSAxLAogCQkuY2hhbm5lbHNfbWF4ID0gMiwK LQkJLnJhdGVzID0gU05EUlZfUENNX1JBVEVfODAwMF8xOTIwMDAgfAotCQkJIFNORFJWX1BDTV9S QVRFX0NPTlRJTlVPVVMgfAotCQkJIFNORFJWX1BDTV9SQVRFX0tOT1QsCisJCS5yYXRlcyA9IFNO RFJWX1BDTV9SQVRFX0NPTlRJTlVPVVMsCisJCS5yYXRlX21pbiA9IDU1MTIsCisJCS5yYXRlX21h eCA9IDE5MjAwMCwKIAkJLmZvcm1hdHMgPSBLSVJLV09PRF9JMlNfRk9STUFUUywKIAl9LAogCS5j YXB0dXJlID0gewogCQkuY2hhbm5lbHNfbWluID0gMSwKIAkJLmNoYW5uZWxzX21heCA9IDIsCi0J CS5yYXRlcyA9IFNORFJWX1BDTV9SQVRFXzgwMDBfMTkyMDAwIHwKLQkJCSBTTkRSVl9QQ01fUkFU RV9DT05USU5VT1VTIHwKLQkJCSBTTkRSVl9QQ01fUkFURV9LTk9ULAorCQkucmF0ZXMgPSBTTkRS Vl9QQ01fUkFURV9DT05USU5VT1VTLAorCQkucmF0ZV9taW4gPSA1NTEyLAorCQkucmF0ZV9tYXgg PSAxOTIwMDAsCiAJCS5mb3JtYXRzID0gS0lSS1dPT0RfSTJTX0ZPUk1BVFMsCiAJfSwKIAkub3Bz ID0gJmtpcmt3b29kX2kyc19kYWlfb3BzLApAQCAtNDk0LDE3ICs0OTQsMTcgQEAgc3RhdGljIHN0 cnVjdCBzbmRfc29jX2RhaV9kcml2ZXIga2lya3dvb2RfaTJzX2RhaV9leHRjbGtbMl0gPSB7CiAJ LnBsYXliYWNrID0gewogCQkuY2hhbm5lbHNfbWluID0gMSwKIAkJLmNoYW5uZWxzX21heCA9IDIs Ci0JCS5yYXRlcyA9IFNORFJWX1BDTV9SQVRFXzgwMDBfMTkyMDAwIHwKLQkJCSBTTkRSVl9QQ01f UkFURV9DT05USU5VT1VTIHwKLQkJCSBTTkRSVl9QQ01fUkFURV9LTk9ULAorCQkucmF0ZXMgPSBT TkRSVl9QQ01fUkFURV9DT05USU5VT1VTLAorCQkucmF0ZV9taW4gPSA1NTEyLAorCQkucmF0ZV9t YXggPSAxOTIwMDAsCiAJCS5mb3JtYXRzID0gS0lSS1dPT0RfU1BESUZfRk9STUFUUywKIAl9LAog CS5jYXB0dXJlID0gewogCQkuY2hhbm5lbHNfbWluID0gMSwKIAkJLmNoYW5uZWxzX21heCA9IDIs Ci0JCS5yYXRlcyA9IFNORFJWX1BDTV9SQVRFXzgwMDBfMTkyMDAwIHwKLQkJCSBTTkRSVl9QQ01f UkFURV9DT05USU5VT1VTIHwKLQkJCSBTTkRSVl9QQ01fUkFURV9LTk9ULAorCQkucmF0ZXMgPSBT TkRSVl9QQ01fUkFURV9DT05USU5VT1VTLAorCQkucmF0ZV9taW4gPSA1NTEyLAorCQkucmF0ZV9t YXggPSAxOTIwMDAsCiAJCS5mb3JtYXRzID0gS0lSS1dPT0RfU1BESUZfRk9STUFUUywKIAl9LAog CS5vcHMgPSAma2lya3dvb2RfaTJzX2RhaV9vcHMsCgoKLS0gCktlbiBhciBjJ2hlbnRhw7EJfAkg ICAgICAqKiBCcmVpemggaGEgTGludXggYXRhdiEgKioKSmVmCQl8CQlodHRwOi8vbW9pbmVqZi5m cmVlLmZyLwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpB bHNhLWRldmVsIG1haWxpbmcgbGlzdApBbHNhLWRldmVsQGFsc2EtcHJvamVjdC5vcmcKaHR0cDov L21haWxtYW4uYWxzYS1wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Fsc2EtZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: moinejf@free.fr (Jean-Francois Moine) Date: Wed, 27 Nov 2013 21:10:24 +0100 Subject: [PATCH] ASoC: kirkwood: Fix the CPU DAI rates Message-ID: <20131127211024.52e5ae1b@armhf> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch fixes the rates declared in the CPU DAI parameters: - SNDRV_PCM_RATE_KNOT and the discrete rates SNDRV_PCM_RATE_xxx should not be used with SNDRV_PCM_RATE_CONTINUOUS, - SNDRV_PCM_RATE_CONTINUOUS asks for rate_min and rate_max, - the device may do streaming down to 5512Hz. Signed-off-by: Jean-Francois Moine --- sound/soc/kirkwood/kirkwood-i2s.c | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 0b18f65..3920a5e 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c @@ -473,17 +473,17 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk[2] = { .playback = { .channels_min = 1, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000 | - SNDRV_PCM_RATE_CONTINUOUS | - SNDRV_PCM_RATE_KNOT, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 5512, + .rate_max = 192000, .formats = KIRKWOOD_I2S_FORMATS, }, .capture = { .channels_min = 1, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000 | - SNDRV_PCM_RATE_CONTINUOUS | - SNDRV_PCM_RATE_KNOT, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 5512, + .rate_max = 192000, .formats = KIRKWOOD_I2S_FORMATS, }, .ops = &kirkwood_i2s_dai_ops, @@ -494,17 +494,17 @@ static struct snd_soc_dai_driver kirkwood_i2s_dai_extclk[2] = { .playback = { .channels_min = 1, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000 | - SNDRV_PCM_RATE_CONTINUOUS | - SNDRV_PCM_RATE_KNOT, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 5512, + .rate_max = 192000, .formats = KIRKWOOD_SPDIF_FORMATS, }, .capture = { .channels_min = 1, .channels_max = 2, - .rates = SNDRV_PCM_RATE_8000_192000 | - SNDRV_PCM_RATE_CONTINUOUS | - SNDRV_PCM_RATE_KNOT, + .rates = SNDRV_PCM_RATE_CONTINUOUS, + .rate_min = 5512, + .rate_max = 192000, .formats = KIRKWOOD_SPDIF_FORMATS, }, .ops = &kirkwood_i2s_dai_ops, -- Ken ar c'henta? | ** Breizh ha Linux atav! ** Jef | http://moinejf.free.fr/