mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH 1/2] ASoC: sun4i-codec: pass through clk_set_rate error
@ 2015-09-29 19:43 Maxime Ripard
  2015-09-29 19:43 ` [PATCH 2/2] ASoC: sun4i-codec: Remove redundant SND_PCM_RATE_KNOT Maxime Ripard
  0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2015-09-29 19:43 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown
  Cc: Emilio Lopez, linux-kernel, linux-arm-kernel, alsa-devel, Maxime Ripard

The current code, disregarding the clk_set_rate error code, was always
returning -EINVAL. Fix that and return the code in order to have more clue
about what's going on.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 sound/soc/sunxi/sun4i-codec.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 6e83e62ef039..28834129bea3 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -283,7 +283,7 @@ static int sun4i_codec_hw_params(struct snd_pcm_substream *substream,
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 	struct sun4i_codec *scodec = snd_soc_card_get_drvdata(rtd->card);
 	unsigned long clk_freq;
-	int hwrate;
+	int ret, hwrate;
 	u32 val;
 
 	if (substream->stream != SNDRV_PCM_STREAM_PLAYBACK)
@@ -293,8 +293,9 @@ static int sun4i_codec_hw_params(struct snd_pcm_substream *substream,
 	if (!clk_freq)
 		return -EINVAL;
 
-	if (clk_set_rate(scodec->clk_module, clk_freq))
-		return -EINVAL;
+	ret = clk_set_rate(scodec->clk_module, clk_freq);
+	if (ret)
+		return ret;
 
 	hwrate = sun4i_codec_get_hw_rate(params);
 	if (hwrate < 0)
-- 
2.5.3


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] ASoC: sun4i-codec: Remove redundant SND_PCM_RATE_KNOT
  2015-09-29 19:43 [PATCH 1/2] ASoC: sun4i-codec: pass through clk_set_rate error Maxime Ripard
@ 2015-09-29 19:43 ` Maxime Ripard
  2015-09-30 18:38   ` Mark Brown
  0 siblings, 1 reply; 3+ messages in thread
From: Maxime Ripard @ 2015-09-29 19:43 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown
  Cc: Emilio Lopez, linux-kernel, linux-arm-kernel, alsa-devel, Maxime Ripard

The SND_PCM_RATE_KNOT covers all the rate settings, even though some that
we don't support, while we also list all the rate we support. Simply remove
it.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 sound/soc/sunxi/sun4i-codec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index 28834129bea3..e5d195fe491e 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -389,8 +389,7 @@ static struct snd_soc_dai_driver sun4i_codec_dai = {
 		.rate_max	= 192000,
 		.rates		= SNDRV_PCM_RATE_8000_48000 |
 				  SNDRV_PCM_RATE_96000 |
-				  SNDRV_PCM_RATE_192000 |
-				  SNDRV_PCM_RATE_KNOT,
+				  SNDRV_PCM_RATE_192000,
 		.formats	= SNDRV_PCM_FMTBIT_S16_LE |
 				  SNDRV_PCM_FMTBIT_S32_LE,
 		.sig_bits	= 24,
-- 
2.5.3


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 2/2] ASoC: sun4i-codec: Remove redundant SND_PCM_RATE_KNOT
  2015-09-29 19:43 ` [PATCH 2/2] ASoC: sun4i-codec: Remove redundant SND_PCM_RATE_KNOT Maxime Ripard
@ 2015-09-30 18:38   ` Mark Brown
  0 siblings, 0 replies; 3+ messages in thread
From: Mark Brown @ 2015-09-30 18:38 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: Liam Girdwood, Emilio Lopez, linux-kernel, linux-arm-kernel, alsa-devel

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

On Tue, Sep 29, 2015 at 09:43:18PM +0200, Maxime Ripard wrote:
> The SND_PCM_RATE_KNOT covers all the rate settings, even though some that
> we don't support, while we also list all the rate we support. Simply remove
> it.

I'll apply this but ideally you'd be able to use _KNOT plus some
extra constraints registered in startup() for maximum flexability but
realistically people mostly only use the standard rates anyway.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-09-30 18:38 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-29 19:43 [PATCH 1/2] ASoC: sun4i-codec: pass through clk_set_rate error Maxime Ripard
2015-09-29 19:43 ` [PATCH 2/2] ASoC: sun4i-codec: Remove redundant SND_PCM_RATE_KNOT Maxime Ripard
2015-09-30 18:38   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®