From: jeeja.kp@intel.com
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, patches.audio@intel.com, broonie@kernel.org,
liam.r.girdwood@intel.com, Jeeja KP <jeeja.kp@intel.com>
Subject: [PATCH v4 6/9] ASoC: Intel: Skylake: Add supply widget in bxt_da_max machine
Date: Mon, 2 Jan 2017 12:44:33 +0530 [thread overview]
Message-ID: <1483341277-14475-7-git-send-email-jeeja.kp@intel.com> (raw)
In-Reply-To: <1483341277-14475-1-git-send-email-jeeja.kp@intel.com>
From: Jeeja KP <jeeja.kp@intel.com>
Maxim codec needs clock to be configured before the SSP startup, so we
need to model the MLCK from SSP5 and turn it on before SSP port is
enabled, so model this in DSP widget parsing.
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
---
sound/soc/intel/boards/bxt_da7219_max98357a.c | 34 +++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c
index bff80b4..c702967 100644
--- a/sound/soc/intel/boards/bxt_da7219_max98357a.c
+++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c
@@ -43,6 +43,36 @@ enum {
BXT_DPCM_AUDIO_HDMI3_PB,
};
+static struct snd_soc_dai *skl_get_dai_widget(struct snd_soc_dapm_widget *w)
+{
+ struct snd_soc_dapm_path *p = NULL;
+
+ snd_soc_dapm_widget_for_each_sink_path(w, p) {
+ if (p->sink->id == snd_soc_dapm_dai_in)
+ return p->sink->priv;
+
+ return skl_get_dai_widget(p->sink);
+ }
+
+ return NULL;
+}
+
+static int ssp_set_clk(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *k, int event)
+{
+ struct snd_soc_dai *cpu_dai = NULL;
+
+ cpu_dai = skl_get_dai_widget(w);
+ if (!cpu_dai)
+ return -EIO;
+
+ /* Enable/Disable the SSP clk */
+ if (SND_SOC_DAPM_EVENT_ON(event))
+ return snd_soc_dai_set_tristate(cpu_dai, 0);
+ else
+ return snd_soc_dai_set_tristate(cpu_dai, 1);
+}
+
static const struct snd_kcontrol_new broxton_controls[] = {
SOC_DAPM_PIN_SWITCH("Headphone Jack"),
SOC_DAPM_PIN_SWITCH("Headset Mic"),
@@ -57,6 +87,9 @@ static const struct snd_soc_dapm_widget broxton_widgets[] = {
SND_SOC_DAPM_SPK("HDMI1", NULL),
SND_SOC_DAPM_SPK("HDMI2", NULL),
SND_SOC_DAPM_SPK("HDMI3", NULL),
+ SND_SOC_DAPM_SUPPLY("ssp5 mclk", SND_SOC_NOPM, 0, 0,
+ ssp_set_clk, SND_SOC_DAPM_PRE_PMU |
+ SND_SOC_DAPM_POST_PMD),
};
static const struct snd_soc_dapm_route broxton_map[] = {
@@ -76,6 +109,7 @@ static const struct snd_soc_dapm_route broxton_map[] = {
/* CODEC BE connections */
{"HiFi Playback", NULL, "ssp5 Tx"},
{"ssp5 Tx", NULL, "codec0_out"},
+ { "codec0_out", NULL, "ssp5 mclk"},
{"Playback", NULL, "ssp1 Tx"},
{"ssp1 Tx", NULL, "codec1_out"},
--
2.5.0
next prev parent reply other threads:[~2017-01-02 7:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-02 7:14 [PATCH v4 0/9] ASoC: Intel: Skylake: Driver updates jeeja.kp
2017-01-02 7:14 ` [PATCH v4 1/9] ALSA: hda: check stream decoupled register state jeeja.kp
2017-01-02 7:14 ` [PATCH v4 2/9] ASoC: Intel: Skylake: Add set_tristate DAI ops to enable SSP MCLK jeeja.kp
2017-01-06 18:32 ` Mark Brown
2017-01-10 9:31 ` Jeeja KP
2017-01-02 7:14 ` [PATCH v4 3/9] ASoC: Intel: Skylake: Remove unused SSP BE prepare DAI ops jeeja.kp
2017-01-02 7:14 ` [PATCH v4 4/9] ASoC: Intel: Skylake: Add supply widget as non DSP widget jeeja.kp
2017-01-02 7:14 ` [PATCH v4 5/9] ASoC: Intel: Skylake: Add supply widget in skl_nau_max machine jeeja.kp
2017-01-02 7:14 ` jeeja.kp [this message]
2017-01-06 18:34 ` [PATCH v4 6/9] ASoC: Intel: Skylake: Add supply widget in bxt_da_max machine Mark Brown
2017-01-02 7:14 ` [PATCH v4 7/9] ASoC: Intel: Skylake: Don't reset pass-through pipe in BE prepare jeeja.kp
2017-01-02 7:14 ` [PATCH v4 8/9] ASoC: Intel: Skylake: set the resume point to LPIB jeeja.kp
2017-01-02 7:14 ` [PATCH v4 9/9] ASoC: hdac_hdmi: Enable pin and converter in prepare jeeja.kp
2017-01-19 18:03 ` Applied "ASoC: hdac_hdmi: Enable pin and converter in prepare" to the asoc tree Mark Brown
2017-01-02 10:01 ` [PATCH v4 0/9] ASoC: Intel: Skylake: Driver updates Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483341277-14475-7-git-send-email-jeeja.kp@intel.com \
--to=jeeja.kp@intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=liam.r.girdwood@intel.com \
--cc=patches.audio@intel.com \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).