From: mengdong.lin@linux.intel.com
To: alsa-devel@alsa-project.org, broonie@kernel.org
Cc: Mengdong Lin <mengdong.lin@linux.intel.com>,
tiwai@suse.de, hardik.t.shah@intel.com,
guneshwor.o.singh@intel.com, liam.r.girdwood@linux.intel.com,
vinod.koul@intel.com, rakesh.a.ughreja@intel.com,
mengdong.lin@intel.com
Subject: [PATCH v2 02/11] ASoC: topology: ABI - Add flags to PCM
Date: Fri, 9 Sep 2016 19:45:27 +0800 [thread overview]
Message-ID: <f99d2b2e874c2aeb1a5f0d76c8e3d21a9d26cd66.1473420558.git.mengdong.lin@linux.intel.com> (raw)
In-Reply-To: <cover.1473420558.git.mengdong.lin@linux.intel.com>
From: Mengdong Lin <mengdong.lin@linux.intel.com>
Add flags to PCM. These flags will be applied to FE (Front End) links.
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h
index 33d00a4..a8d25be 100644
--- a/include/uapi/sound/asoc.h
+++ b/include/uapi/sound/asoc.h
@@ -130,6 +130,10 @@
#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_CHANNELS (1 << 1)
#define SND_SOC_TPLG_DAI_FLGBIT_SYMMETRIC_SAMPLEBITS (1 << 2)
+/* DAI link flags */
+#define SND_SOC_TPLG_LNK_FLGBIT_IGNORE_SUSPEND (1 << 0)
+#define SND_SOC_TPLG_LNK_FLGBIT_IGNORE_POWERDOWN_TIME (1 << 1)
+
/*
* Block Header.
* This header precedes all object and object arrays below.
@@ -440,6 +444,8 @@ struct snd_soc_tplg_pcm {
struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */
__le32 num_streams; /* number of streams */
struct snd_soc_tplg_stream_caps caps[2]; /* playback and capture for DAI */
+ __le32 flag_mask; /* bitmask of flags to configure */
+ __le32 flags; /* SND_SOC_TPLG_LNK_FLGBIT_* flag value */
} __attribute__((packed));
diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index b271248..ede60df 100644
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -1621,6 +1621,18 @@ static int soc_tplg_dai_create(struct soc_tplg *tplg,
return snd_soc_register_dai(tplg->comp, dai_drv);
}
+static void set_link_flags(struct snd_soc_dai_link *link,
+ unsigned int flag_mask, unsigned int flags)
+{
+ if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_IGNORE_SUSPEND)
+ link->ignore_suspend =
+ flags & SND_SOC_TPLG_LNK_FLGBIT_IGNORE_SUSPEND ? 1 : 0;
+
+ if (flag_mask & SND_SOC_TPLG_LNK_FLGBIT_IGNORE_POWERDOWN_TIME)
+ link->ignore_pmdown_time =
+ flags & SND_SOC_TPLG_LNK_FLGBIT_IGNORE_POWERDOWN_TIME ? 1 : 0;
+}
+
/* create the FE DAI link */
static int soc_tplg_link_create(struct soc_tplg *tplg,
struct snd_soc_tplg_pcm *pcm)
@@ -1644,6 +1656,8 @@ static int soc_tplg_link_create(struct soc_tplg *tplg,
link->dynamic = 1;
link->dpcm_playback = pcm->playback;
link->dpcm_capture = pcm->capture;
+ if (pcm->flag_mask)
+ set_link_flags(link, pcm->flag_mask, pcm->flags);
/* pass control to component driver for optional further init */
ret = soc_tplg_dai_link_load(tplg, link);
--
2.5.0
next prev parent reply other threads:[~2016-09-09 11:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-09 11:41 [PATCH v2 00/11] ASoC: topology: Remaining kernel patches mengdong.lin
2016-09-09 11:43 ` [PATCH v2 01/11] ASoC: topology: Able to create BE DAIs mengdong.lin
2016-09-16 14:56 ` Mark Brown
2016-09-19 17:09 ` Shah, Hardik T
2016-09-21 5:44 ` Mengdong Lin
2016-09-21 7:09 ` Liam Girdwood
2016-09-24 18:56 ` Mark Brown
2016-09-09 11:45 ` mengdong.lin [this message]
2016-09-09 11:45 ` [PATCH v2 03/11] ASoC: topology: ABI - Add private data to PCM mengdong.lin
2016-09-09 11:45 ` [PATCH v2 04/11] ASoC: topology: Add FE DAIs only if not already added mengdong.lin
2016-09-09 11:46 ` [PATCH v2 05/11] ASoC: topology: ABI - Add name & component info to BE/CC links mengdong.lin
2016-09-09 11:46 ` [PATCH v2 06/11] ASoC: topology: ABI - Define DAI physical PCM data formats mengdong.lin
2016-09-09 11:46 ` [PATCH v2 07/11] ASoC: topology: ABI - Add HW configurations to BE/CC links mengdong.lin
2016-09-09 11:46 ` [PATCH v2 08/11] ASoC: topology: ABI - Add flags and private data " mengdong.lin
2016-09-09 11:46 ` [PATCH v2 09/11] ASoC: Define API to find a dai link by id mengdong.lin
2016-09-09 11:46 ` [PATCH v2 10/11] ASoC: Probe link components after finding new links mengdong.lin
2016-09-09 11:46 ` [PATCH v2 11/11] ASoC: topology: Able to create BE DAI links mengdong.lin
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=f99d2b2e874c2aeb1a5f0d76c8e3d21a9d26cd66.1473420558.git.mengdong.lin@linux.intel.com \
--to=mengdong.lin@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=guneshwor.o.singh@intel.com \
--cc=hardik.t.shah@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=mengdong.lin@intel.com \
--cc=rakesh.a.ughreja@intel.com \
--cc=tiwai@suse.de \
--cc=vinod.koul@intel.com \
/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).