All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Subhransu S. Prusty" <subhransu.s.prusty@intel.com>
To: alsa-devel@alsa-project.org
Cc: vinod.koul@intel.com, broonie@kernel.org,
	"Subhransu S. Prusty" <subhransu.s.prusty@intel.com>,
	lgirdwood@gmail.com, Lars-Peter Clausen <lars@metafoo.de>
Subject: [v4 12/12] ASoC: Intel: mrfld: add the DSP mixers
Date: Mon,  4 Aug 2014 15:16:03 +0530	[thread overview]
Message-ID: <1407145563-1303-13-git-send-email-subhransu.s.prusty@intel.com> (raw)
In-Reply-To: <1407145563-1303-1-git-send-email-subhransu.s.prusty@intel.com>

From: Vinod Koul <vinod.koul@intel.com>

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
---
 sound/soc/intel/sst-atom-controls.c | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/sound/soc/intel/sst-atom-controls.c b/sound/soc/intel/sst-atom-controls.c
index 029e6960ca73..a681abe1ff06 100644
--- a/sound/soc/intel/sst-atom-controls.c
+++ b/sound/soc/intel/sst-atom-controls.c
@@ -855,6 +855,32 @@ static const struct snd_soc_dapm_widget sst_dapm_widgets[] = {
 	SST_PATH_MEDIA_LOOP_OUTPUT("media_loop2_out", SST_TASK_SBA, SST_SWM_OUT_MEDIA_LOOP2, SST_FMT_STEREO, sst_set_media_loop),
 
 	/* Media Mixers */
+	SST_SWM_MIXER("media0_out mix 0", SND_SOC_NOPM, SST_TASK_MMX, SST_SWM_OUT_MEDIA0,
+		      sst_mix_media0_controls, sst_swm_mixer_event),
+	SST_SWM_MIXER("media1_out mix 0", SND_SOC_NOPM, SST_TASK_MMX, SST_SWM_OUT_MEDIA1,
+		      sst_mix_media1_controls, sst_swm_mixer_event),
+
+	/* SBA PCM mixers */
+	SST_SWM_MIXER("pcm0_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_PCM0,
+		      sst_mix_pcm0_controls, sst_swm_mixer_event),
+	SST_SWM_MIXER("pcm1_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_PCM1,
+		      sst_mix_pcm1_controls, sst_swm_mixer_event),
+	SST_SWM_MIXER("pcm2_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_PCM2,
+		      sst_mix_pcm2_controls, sst_swm_mixer_event),
+
+	/* SBA Loop mixers */
+	SST_SWM_MIXER("sprot_loop_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_SPROT_LOOP,
+		      sst_mix_sprot_l0_controls, sst_swm_mixer_event),
+	SST_SWM_MIXER("media_loop1_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_MEDIA_LOOP1,
+		      sst_mix_media_l1_controls, sst_swm_mixer_event),
+	SST_SWM_MIXER("media_loop2_out mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_MEDIA_LOOP2,
+		      sst_mix_media_l2_controls, sst_swm_mixer_event),
+
+	/* SBA Backend mixers */
+	SST_SWM_MIXER("codec_out0 mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_CODEC0,
+		      sst_mix_codec0_controls, sst_swm_mixer_event),
+	SST_SWM_MIXER("codec_out1 mix 0", SND_SOC_NOPM, SST_TASK_SBA, SST_SWM_OUT_CODEC1,
+		      sst_mix_codec1_controls, sst_swm_mixer_event),
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
-- 
1.9.0

      parent reply	other threads:[~2014-08-04 10:08 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-04  9:45 [v4 00/12] Add mrfld DSP topology and widgets Subhransu S. Prusty
2014-08-04  9:45 ` [v4 01/12] ASoC: Intel: mfld-pcm: add FE and BE ops Subhransu S. Prusty
2014-08-13 19:35   ` Mark Brown
2014-08-04  9:45 ` [v4 02/12] ASoC: Intel: mrfld: set private data for cpu-dai Subhransu S. Prusty
2014-08-13 19:45   ` Mark Brown
2014-08-18  5:39     ` [alsa-devel] " Subhransu S. Prusty
2014-08-18  5:39     ` Subhransu S. Prusty
2014-08-13 19:50   ` Lars-Peter Clausen
2014-08-14  5:36     ` Subhransu S. Prusty
2014-08-14  5:36     ` [alsa-devel] " Subhransu S. Prusty
2014-08-14  6:16       ` Lars-Peter Clausen
2014-08-04  9:45 ` [v4 03/12] ASoC: intel: mfld-pcm: don't call trigger ops to DSP for internal streams Subhransu S. Prusty
2014-08-04  9:45 ` [v4 04/12] ASoC: Intel: add mrfld DSP defines Subhransu S. Prusty
2014-08-13 19:47   ` Mark Brown
2014-08-04  9:45 ` [v4 05/12] ASoC: Intel: mrfld: add bytes control for modules Subhransu S. Prusty
2014-08-13 20:00   ` Mark Brown
2014-08-18  5:36     ` [alsa-devel] " Subhransu S. Prusty
2014-08-18 10:15       ` Subhransu S. Prusty
2014-08-18 14:25         ` Mark Brown
2014-08-18 10:15       ` Subhransu S. Prusty
2014-08-18 14:19       ` Mark Brown
2014-08-18  5:36     ` Subhransu S. Prusty
2014-08-04  9:45 ` [v4 06/12] ASoC: Intel: mrfld: add the gain controls Subhransu S. Prusty
2014-08-13 20:03   ` Mark Brown
2014-08-18  5:05     ` [alsa-devel] " Subhransu S. Prusty
2014-08-18  5:05     ` Subhransu S. Prusty
2014-08-04  9:45 ` [v4 07/12] ASoC: Intel: mfld-pcm: add control for powering up/down dsp Subhransu S. Prusty
2014-08-13 20:04   ` Mark Brown
2014-08-04  9:45 ` [v4 08/12] ASoC: Intel: mrfld: add DSP core controls Subhransu S. Prusty
2014-08-04  9:46 ` [v4 09/12] ASoC: Export dapm_kcontrol_get_value Subhransu S. Prusty
2014-08-04  9:46 ` [v4 10/12] ASoC: Intel: mrfld: add the DSP DAPM widgets Subhransu S. Prusty
2014-08-13 20:14   ` Mark Brown
2014-08-14 10:21     ` Subhransu S. Prusty
2014-08-14 10:21     ` [alsa-devel] " Subhransu S. Prusty
2014-08-14 13:07       ` Mark Brown
2014-08-18  4:28         ` Subhransu S. Prusty
2014-08-18  4:28         ` [alsa-devel] " Subhransu S. Prusty
2014-08-18 13:56           ` Mark Brown
2014-08-19  4:27             ` [alsa-devel] " Subhransu S. Prusty
2014-08-19 16:03               ` Mark Brown
2014-08-19  4:27             ` Subhransu S. Prusty
2014-08-04  9:46 ` [v4 11/12] ASoC: Intel: mfld-pcm: add the fe & be dai ops Subhransu S. Prusty
2014-08-13 20:16   ` Mark Brown
2014-08-18  4:51     ` [alsa-devel] " Subhransu S. Prusty
2014-08-18  4:51     ` Subhransu S. Prusty
2014-08-04  9:46 ` Subhransu S. Prusty [this message]

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=1407145563-1303-13-git-send-email-subhransu.s.prusty@intel.com \
    --to=subhransu.s.prusty@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lars@metafoo.de \
    --cc=lgirdwood@gmail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.