From: Brent Lu <brent.lu@xxxxxxxxx>
Add a dapm route to provide ssp mclk/sclk early
for DMIC on SSP0(rt5514) and Headset on SSP1(rt5663)
since sclk for both codecs are different the
struct now defines SSP0 and SSP1 mclk , sclk separately
This change ensures the DMIC PCM port
will not return all-zero data
Signed-off-by: Brent Lu <brent.lu@xxxxxxxxx>
Signed-off-by: Vamshi Krishna Gopal <vamshi.krishna.gopal@xxxxxxxxx>
---
.../intel/boards/kbl_rt5663_rt5514_max98927.c | 150 ++++++++++++------
1 file changed, 102 insertions(+), 48 deletions(-)
diff --git a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
index b34cf6cf1139..584e4f9cedc2 100644
--- a/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
+++ b/sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
@@ -53,8 +53,10 @@ struct kbl_codec_private {
struct snd_soc_jack kabylake_headset;
struct list_head hdmi_pcm_list;
struct snd_soc_jack kabylake_hdmi[2];
- struct clk *mclk;
- struct clk *sclk;
+ struct clk *ssp0_mclk;
+ struct clk *ssp0_sclk;
+ struct clk *ssp1_mclk;
+ struct clk *ssp1_sclk;
};
enum {
@@ -77,13 +79,31 @@ static const struct snd_kcontrol_new kabylake_controls[] = {
};
static int platform_clock_control(struct snd_soc_dapm_widget *w,
- struct snd_kcontrol *k, int event)
+ struct snd_kcontrol *k, int event, int ssp_num)
{
struct snd_soc_dapm_context *dapm = w->dapm;
struct snd_soc_card *card = dapm->card;
struct kbl_codec_private *priv = snd_soc_card_get_drvdata(card);
+ struct clk *mclk, *sclk;
+ unsigned long sclk_rate;
int ret = 0;
+ switch (ssp_num) {
+ case 0:
+ mclk = priv->ssp0_mclk;
+ sclk = priv->ssp0_sclk;
+ sclk_rate = 6144000;
+ break;
+ case 1:
+ mclk = priv->ssp1_mclk;
+ sclk = priv->ssp1_sclk;
+ sclk_rate = 3072000;
+ break;
+ default:
+ dev_err(card->dev, "Invalid ssp_num %d\n", ssp_num);
+ return -EINVAL;
+ }
+
/*
* MCLK/SCLK need to be ON early for a successful synchronization of
* codec internal clock. And the clocks are turned off during
@@ -91,38 +111,46 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
*/
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
+ if (__clk_is_enabled(mclk))
+ return 0;
+
/* Enable MCLK */
- ret = clk_set_rate(priv->mclk, 24000000);
+ ret = clk_set_rate(mclk, 24000000);
if (ret < 0) {
- dev_err(card->dev, "Can't set rate for mclk, err: %d\n",
- ret);
+ dev_err(card->dev, "Can't set rate for ssp%d_mclk, err: %d\n",
+ ssp_num, ret);
return ret;
}
- ret = clk_prepare_enable(priv->mclk);
+ ret = clk_prepare_enable(mclk);
if (ret < 0) {
- dev_err(card->dev, "Can't enable mclk, err: %d\n", ret);
+ dev_err(card->dev, "Can't enable ssp%d_mclk, err: %d\n",
+ ssp_num, ret);
return ret;
}
/* Enable SCLK */
- ret = clk_set_rate(priv->sclk, 3072000);
+ ret = clk_set_rate(sclk, sclk_rate);
if (ret < 0) {
- dev_err(card->dev, "Can't set rate for sclk, err: %d\n",
- ret);
- clk_disable_unprepare(priv->mclk);
+ dev_err(card->dev, "Can't set rate for ssp%d_sclk, err: %d\n",
+ ssp_num, ret);
+ clk_disable_unprepare(mclk);
return ret;
}
- ret = clk_prepare_enable(priv->sclk);
+ ret = clk_prepare_enable(sclk);
if (ret < 0) {
- dev_err(card->dev, "Can't enable sclk, err: %d\n", ret);
- clk_disable_unprepare(priv->mclk);
+ dev_err(card->dev, "Can't enable ssp%d_sclk, err: %d\n",
+ ssp_num, ret);
+ clk_disable_unprepare(mclk);
}
break;
case SND_SOC_DAPM_POST_PMD:
- clk_disable_unprepare(priv->mclk);
- clk_disable_unprepare(priv->sclk);
+ if (!__clk_is_enabled(mclk))
+ return 0;
+
+ clk_disable_unprepare(mclk);
+ clk_disable_unprepare(sclk);
break;
default:
return 0;
@@ -131,6 +159,18 @@ static int platform_clock_control(struct snd_soc_dapm_widget *w,
return 0;
}
+static int platform_clock_control_ssp0(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *k, int event)
+{
+ return platform_clock_control(w, k, event, 0);
+}
+
+static int platform_clock_control_ssp1(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *k, int event)
+{
+ return platform_clock_control(w, k, event, 1);
+}
+
static const struct snd_soc_dapm_widget kabylake_widgets[] = {
SND_SOC_DAPM_HP("Headphone Jack", NULL),
SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -139,15 +179,17 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = {
SND_SOC_DAPM_MIC("DMIC", NULL),
SND_SOC_DAPM_SPK("HDMI1", NULL),
SND_SOC_DAPM_SPK("HDMI2", NULL),
- SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
- platform_clock_control, SND_SOC_DAPM_PRE_PMU |
+ SND_SOC_DAPM_SUPPLY("Platform Clock SSP0", SND_SOC_NOPM, 0, 0,
+ platform_clock_control_ssp0, SND_SOC_DAPM_PRE_PMU |
+ SND_SOC_DAPM_POST_PMD),
+ SND_SOC_DAPM_SUPPLY("Platform Clock SSP1", SND_SOC_NOPM, 0, 0,
+ platform_clock_control_ssp1, SND_SOC_DAPM_PRE_PMU |
SND_SOC_DAPM_POST_PMD),
-
};
static const struct snd_soc_dapm_route kabylake_map[] = {
/* Headphones */
- { "Headphone Jack", NULL, "Platform Clock" },
+ { "Headphone Jack", NULL, "Platform Clock SSP1" },
{ "Headphone Jack", NULL, "HPOL" },
{ "Headphone Jack", NULL, "HPOR" },
@@ -156,7 +198,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
{ "Right Spk", NULL, "Right BE_OUT" },
/* other jacks */
- { "Headset Mic", NULL, "Platform Clock" },
+ { "Headset Mic", NULL, "Platform Clock SSP1" },
{ "IN1P", NULL, "Headset Mic" },
{ "IN1N", NULL, "Headset Mic" },
@@ -180,6 +222,7 @@ static const struct snd_soc_dapm_route kabylake_map[] = {
{ "ssp0 Rx", NULL, "Right HiFi Capture" },
/* DMIC */
+ { "DMIC", NULL, "Platform Clock SSP0" },
{ "DMIC1L", NULL, "DMIC" },
{ "DMIC1R", NULL, "DMIC" },
{ "DMIC2L", NULL, "DMIC" },
@@ -666,7 +709,7 @@ static int kabylake_set_bias_level(struct snd_soc_card *card,
if (!component || strcmp(component->name, RT5514_DEV_NAME))
return 0;
- if (IS_ERR(priv->mclk))
+ if (IS_ERR(priv->ssp0_mclk))
return 0;
/*
@@ -678,17 +721,17 @@ static int kabylake_set_bias_level(struct snd_soc_card *card,
case SND_SOC_BIAS_PREPARE:
if (dapm->bias_level == SND_SOC_BIAS_ON) {
dev_dbg(card->dev, "Disable mclk");
- clk_disable_unprepare(priv->mclk);
+ clk_disable_unprepare(priv->ssp0_mclk);
} else {
dev_dbg(card->dev, "Enable mclk");
- ret = clk_set_rate(priv->mclk, 24000000);
+ ret = clk_set_rate(priv->ssp0_mclk, 24000000);
if (ret) {
dev_err(card->dev, "Can't set rate for mclk, err: %d\n",
ret);
return ret;
}
- ret = clk_prepare_enable(priv->mclk);
+ ret = clk_prepare_enable(priv->ssp0_mclk);
if (ret) {
dev_err(card->dev, "Can't enable mclk, err: %d\n",
ret);
@@ -757,6 +800,29 @@ static struct snd_soc_card kabylake_audio_card = {
.late_probe = kabylake_card_late_probe,
};
+static int kabylake_audio_clk_get(struct device *dev, const char *id,
+ struct clk **clk)
+{
+ int ret = 0;
+
+ if (!clk)
+ return -EINVAL;
+
+ *clk = devm_clk_get(dev, id);
+ if (IS_ERR(*clk)) {
+ ret = PTR_ERR(*clk);
+ if (ret == -ENOENT) {
+ dev_info(dev, "Failed to get %s, defer probe\n", id);
+ return -EPROBE_DEFER;
+ }
+
+ dev_err(dev, "Failed to get %s with err:%d\n", id, ret);
+ return ret;
+ }
+
+ return ret;
+}
+
static int kabylake_audio_probe(struct platform_device *pdev)
{
struct kbl_codec_private *ctx;
@@ -777,33 +843,21 @@ static int kabylake_audio_probe(struct platform_device *pdev)
dmic_constraints = mach->mach_params.dmic_num == 2 ?
&constraints_dmic_2ch : &constraints_dmic_channels;
- ctx->mclk = devm_clk_get(&pdev->dev, "ssp1_mclk");
- if (IS_ERR(ctx->mclk)) {
- ret = PTR_ERR(ctx->mclk);
- if (ret == -ENOENT) {
- dev_info(&pdev->dev,
- "Failed to get ssp1_mclk, defer probe\n");
- return -EPROBE_DEFER;
- }
+ ret = kabylake_audio_clk_get(&pdev->dev, "ssp0_mclk", &ctx->ssp0_mclk);
+ if (ret != 0)
+ return ret;
- dev_err(&pdev->dev, "Failed to get ssp1_mclk with err:%d\n",
- ret);
+ ret = kabylake_audio_clk_get(&pdev->dev, "ssp0_sclk", &ctx->ssp0_sclk);
+ if (ret != 0)
return ret;
- }
- ctx->sclk = devm_clk_get(&pdev->dev, "ssp1_sclk");
- if (IS_ERR(ctx->sclk)) {
- ret = PTR_ERR(ctx->sclk);
- if (ret == -ENOENT) {
- dev_info(&pdev->dev,
- "Failed to get ssp1_sclk, defer probe\n");
- return -EPROBE_DEFER;
- }
+ ret = kabylake_audio_clk_get(&pdev->dev, "ssp1_mclk", &ctx->ssp1_mclk);
+ if (ret != 0)
+ return ret;
- dev_err(&pdev->dev, "Failed to get ssp1_sclk with err:%d\n",
- ret);
+ ret = kabylake_audio_clk_get(&pdev->dev, "ssp1_sclk", &ctx->ssp1_sclk);
+ if (ret != 0)
return ret;
- }
return devm_snd_soc_register_card(&pdev->dev, &kabylake_audio_card);
}
--
2.17.1
