From: Nikesh@vger.kernel.org, Oswal@vger.kernel.org
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: perex@perex.cz, tiwai@suse.de, alsa-devel@alsa-project.org,
linux-kernel@vger.kernel.org,
nikesh <Nikesh.Oswal@wolfsonmicro.com>
Subject: [PATCH] ASOC: dapm: add param_fixup callback
Date: Mon, 24 Feb 2014 13:54:18 +0000 [thread overview]
Message-ID: <1393250058-18430-1-git-send-email-Nikesh.Oswal@wolfsonmicro.com> (raw)
From: nikesh <Nikesh.Oswal@wolfsonmicro.com>
dai-link params for codec-codec links were fixed.
The fixed link between codec and another chip which
may be another codec, baseband, bluetooth codec etc
may require run time configuaration changes.
This change provides an optional callback to modify
these params.
Change-Id: Iad6ee3951bc4e8b8bc519c62642a2b4bcd949c18
Signed-off-by: nikesh <Nikesh.Oswal@wolfsonmicro.com>
---
include/sound/soc-dapm.h | 7 ++++---
include/sound/soc.h | 4 +++-
sound/soc/soc-core.c | 4 ++--
sound/soc/soc-dapm.c | 21 +++++++++++++++++----
4 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 68d92e3..e3497ed 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -414,9 +414,10 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm,
int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);
void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);
int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
- const struct snd_soc_pcm_stream *params,
+ struct snd_soc_pcm_stream *params,
struct snd_soc_dapm_widget *source,
- struct snd_soc_dapm_widget *sink);
+ struct snd_soc_dapm_widget *sink,
+ struct snd_soc_dai_link *dai_link);
/* dapm path setup */
int snd_soc_dapm_new_widgets(struct snd_soc_card *card);
@@ -561,7 +562,7 @@ struct snd_soc_dapm_widget {
void *priv; /* widget specific data */
struct regulator *regulator; /* attached regulator */
- const struct snd_soc_pcm_stream *params; /* params for dai links */
+ struct snd_soc_pcm_stream *params; /* params for dai links */
/* dapm control */
int reg; /* negative reg = no direct dapm */
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 9a00147..401c911 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -875,7 +875,9 @@ struct snd_soc_dai_link {
const struct device_node *platform_of_node;
int be_id; /* optional ID for machine driver BE identification */
- const struct snd_soc_pcm_stream *params;
+ struct snd_soc_pcm_stream *params;
+ /* optional params re-writing for dai links */
+ int (*params_fixup)(struct snd_soc_dapm_widget *w, int event);
unsigned int dai_fmt; /* format to set on init */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index fe1df50..4f03e88 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1469,7 +1469,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
capture_w = cpu_dai->capture_widget;
if (play_w && capture_w) {
ret = snd_soc_dapm_new_pcm(card, dai_link->params,
- capture_w, play_w);
+ capture_w, play_w, dai_link);
if (ret != 0) {
dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
play_w->name, capture_w->name, ret);
@@ -1481,7 +1481,7 @@ static int soc_probe_link_dais(struct snd_soc_card *card, int num, int order)
capture_w = codec_dai->capture_widget;
if (play_w && capture_w) {
ret = snd_soc_dapm_new_pcm(card, dai_link->params,
- capture_w, play_w);
+ capture_w, play_w, dai_link);
if (ret != 0) {
dev_err(card->dev, "ASoC: Can't link %s to %s: %d\n",
play_w->name, capture_w->name, ret);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index dc8ff13..dc1ef8b 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3378,11 +3378,12 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
{
struct snd_soc_dapm_path *source_p, *sink_p;
struct snd_soc_dai *source, *sink;
- const struct snd_soc_pcm_stream *config = w->params;
+ struct snd_soc_pcm_stream *config = w->params;
+ struct snd_soc_dai_link *dai_link = w->priv;
struct snd_pcm_substream substream;
struct snd_pcm_hw_params *params = NULL;
u64 fmt;
- int ret;
+ int ret = 0;
if (WARN_ON(!config) ||
WARN_ON(list_empty(&w->sources) || list_empty(&w->sinks)))
@@ -3402,6 +3403,16 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
source = source_p->source->priv;
sink = sink_p->sink->priv;
+ if (dai_link && dai_link->params_fixup) {
+ ret = dai_link->params_fixup(w, event);
+ if (ret < 0) {
+ dev_err(w->dapm->dev,
+ "ASoC: params_fixup for dai link widget failed %d\n",
+ ret);
+ goto out;
+ }
+ }
+
/* Be a little careful as we don't want to overflow the mask array */
if (config->formats) {
fmt = ffs(config->formats) - 1;
@@ -3483,9 +3494,10 @@ out:
}
int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
- const struct snd_soc_pcm_stream *params,
+ struct snd_soc_pcm_stream *params,
struct snd_soc_dapm_widget *source,
- struct snd_soc_dapm_widget *sink)
+ struct snd_soc_dapm_widget *sink,
+ struct snd_soc_dai_link *dai_link)
{
struct snd_soc_dapm_route routes[2];
struct snd_soc_dapm_widget template;
@@ -3517,6 +3529,7 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card,
}
w->params = params;
+ w->priv = (void *)dai_link;
memset(&routes, 0, sizeof(routes));
--
1.7.9.5
next reply other threads:[~2014-02-24 13:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 13:54 Nikesh, Oswal [this message]
2014-02-25 1:05 ` Mark Brown
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=1393250058-18430-1-git-send-email-Nikesh.Oswal@wolfsonmicro.com \
--to=nikesh@vger.kernel.org \
--cc=Nikesh.Oswal@wolfsonmicro.com \
--cc=Oswal@vger.kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--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
all inboxes | Powered by JetHome®