Skip to contentSkip to conversation

ASoC: rt5677: Convert to use rl6231_get_clk_info

PATCH RESEND Applied Axel Lin 2 participants 5 messages Jun 10, 2014 – Jun 16, 2014

Subsystems (3)
Sound ASoC Realtek audio codecs
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH RESEND 1/1 ASoC: rt5677: Convert to use rl6231_get_clk_info

Signed-off-by Axel Lin <[email protected]>
Tested-by Oder Chiou <[email protected]>
---
 sound/soc/codecs/Kconfig  |  2 ++
 sound/soc/codecs/rt5677.c | 18 ++----------------
 2 files changed, 4 insertions(+), 16 deletions(-)
sound/soc/codecs/Kconfig +2 -0
index cbfa1e1..9d88845 100644
@@ -445,9 +445,11 @@ config SND_SOC_RL6231
 	default y if SND_SOC_RT5640=y
 	default y if SND_SOC_RT5645=y
 	default y if SND_SOC_RT5651=y
+	default y if SND_SOC_RT5677=y
 	default m if SND_SOC_RT5640=m
 	default m if SND_SOC_RT5645=m
 	default m if SND_SOC_RT5651=m
+	default m if SND_SOC_RT5677=m
 
 config SND_SOC_RT5631
 	tristate
sound/soc/codecs/rt5677.c +2 -16
index 60fff7f..1ffc689 100644
@@ -27,6 +27,7 @@
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
+#include "rl6231.h"
 #include "rt5677.h"
 
 #define RT5677_DEVICE_ID 0x6327

@@ -2798,21 +2799,6 @@ static const struct snd_soc_dapm_route rt5677_dapm_routes[] = {
 	{ "PDM2R", NULL, "PDM2 R Mux" },
 };
 
-static int get_clk_info(int sclk, int rate)
-{
-	int i, pd[] = {1, 2, 3, 4, 6, 8, 12, 16};
-
-	if (sclk <= 0 || rate <= 0)
-		return -EINVAL;
-
-	rate = rate << 8;
-	for (i = 0; i < ARRAY_SIZE(pd); i++)
-		if (sclk == rate * pd[i])
-			return i;
-
-	return -EINVAL;
-}
-
 static int rt5677_hw_params(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params, struct snd_soc_dai *dai)
 {

@@ -2822,7 +2808,7 @@ static int rt5677_hw_params(struct snd_pcm_substream *substream,
 	int pre_div, bclk_ms, frame_size;
 
 	rt5677->lrck[dai->id] = params_rate(params);
-	pre_div = get_clk_info(rt5677->sysclk, rt5677->lrck[dai->id]);
+	pre_div = rl6231_get_clk_info(rt5677->sysclk, rt5677->lrck[dai->id]);
 	if (pre_div < 0) {
 		dev_err(codec->dev, "Unsupported clock setting\n");
 		return -EINVAL;
Signature · 1 line
1.8.3.2
author
#1 lore raw

2014-06-10 8:57 GMT+08:00 Axel Lin <[email protected]>:

Quoted 12 lines
Signed-off-by Axel Lin <[email protected]>
Tested-by Oder Chiou <[email protected]>
---
 sound/soc/codecs/Kconfig  |  2 ++
 sound/soc/codecs/rt5677.c | 18 ++----------------
 2 files changed, 4 insertions(+), 16 deletions(-)
sound/soc/codecs/Kconfig +0 -0
index cbfa1e1..9d88845 100644

sound/soc/codecs/Kconfig config SND_SOC_RL6231 · line 452

Quoted 8 lines
sound/soc/codecs/Kconfig +2 -0
@@ -445,9 +445,11 @@ config SND_SOC_RL6231
        default y if SND_SOC_RT5640=y
        default y if SND_SOC_RT5645=y
        default y if SND_SOC_RT5651=y
+       default y if SND_SOC_RT5677=y
        default m if SND_SOC_RT5640=m
        default m if SND_SOC_RT5645=m
        default m if SND_SOC_RT5651=m
+       default m if SND_SOC_RT5677=m

Hi Mark,
This patch ensures SND_SOC_RL6231 will be built. This patch is required to fix build error with commit "ASoC: rt5677: Convert to use rl6231_calc_dmic_clk".

Regards,
Axel

maintainer
#2 lore raw
Quoted 3 lines · Axel Lin

This patch ensures SND_SOC_RL6231 will be built. This patch is required to fix build error with commit "ASoC: rt5677: Convert to use rl6231_calc_dmic_clk".

Sure, but remember that that patch isn't in -next yet since the merge window is still open. I'll get to it at some point before it is.

author
#3 lore raw

2014-06-12 17:49 GMT+08:00 Mark Brown <[email protected]>:

Quoted 8 lines · Axel Lin
Quoted 4 lines

This patch ensures SND_SOC_RL6231 will be built. This patch is required to fix build error with commit "ASoC: rt5677: Convert to use rl6231_calc_dmic_clk".

Sure, but remember that that patch isn't in -next yet since the merge window is still open. I'll get to it at some point before it is.

OK, and thanks.
I sent the mail because I got a build error report from "kbuild test robot". Axel