Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Subject: Applied "ASoC: rsnd: mix: add rsnd_mix_halt()" to the asoc tree
Date: Tue, 01 Dec 2015 22:59:56 +0000	[thread overview]
Message-ID: <E1a3tts-0006tp-TO@debutante> (raw)
In-Reply-To: <871tb7ub1p.wl%kuninori.morimoto.gx@renesas.com>

The patch

   ASoC: rsnd: mix: add rsnd_mix_halt()

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 95e6b0ddb002e0dc89fef99b31685197da2eca9e Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Mon, 30 Nov 2015 08:51:52 +0000
Subject: [PATCH] ASoC: rsnd: mix: add rsnd_mix_halt()

Based on datasheet process

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sh/rcar/mix.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index b2f22bd7e3a9..b34957ab75b9 100644
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -30,6 +30,12 @@ static void rsnd_mix_activation(struct rsnd_mod *mod)
 	rsnd_mod_write(mod, MIX_SWRSR, 1);
 }
 
+static void rsnd_mix_halt(struct rsnd_mod *mod)
+{
+	rsnd_mod_write(mod, MIX_MIXIR, 1);
+	rsnd_mod_write(mod, MIX_SWRSR, 0);
+}
+
 static void rsnd_mix_volume_parameter(struct rsnd_dai_stream *io,
 				      struct rsnd_mod *mod)
 {
@@ -96,6 +102,8 @@ static int rsnd_mix_quit(struct rsnd_mod *mod,
 			 struct rsnd_dai_stream *io,
 			 struct rsnd_priv *priv)
 {
+	rsnd_mix_halt(mod);
+
 	rsnd_mod_power_off(mod);
 
 	return 0;
-- 
2.6.2

  reply	other threads:[~2015-12-01 23:00 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-30  8:48 [PATCH 0/14] ASoC: rsnd: TDM Extend Mode support Kuninori Morimoto
2015-11-30  8:49 ` [PATCH 01/14] ASoC: rsnd: don't use normal *mod in adg.c Kuninori Morimoto
2015-12-01 23:00   ` Applied "ASoC: rsnd: don't use normal *mod in adg.c" to the asoc tree Mark Brown
2015-11-30  8:49 ` [PATCH 02/14] ASoC: rsnd: add missing ADINR::CHNUM on DVC/SRC/SSIU Kuninori Morimoto
2015-12-01 23:00   ` Applied "ASoC: rsnd: add missing ADINR::CHNUM on DVC/SRC/SSIU" to the asoc tree Mark Brown
2015-11-30  8:50 ` [PATCH 03/14] ASoC: rsnd: add missing SRC_O_BUSIF_MODE register Kuninori Morimoto
2015-12-01 23:00   ` Applied "ASoC: rsnd: add missing SRC_O_BUSIF_MODE register" to the asoc tree Mark Brown
2015-11-30  8:50 ` [PATCH 04/14] ASoC: rsnd: src: rename rsnd_src_soft_reset() to rsnd_src_activation() Kuninori Morimoto
2015-12-01 23:00   ` Applied "ASoC: rsnd: src: rename rsnd_src_soft_reset() to rsnd_src_activation()" to the asoc tree Mark Brown
2015-11-30  8:50 ` [PATCH 05/14] ASoC: rsnd: mix: rename rsnd_mix_soft_reset() to rsnd_mix_activation() Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: mix: rename rsnd_mix_soft_reset() to rsnd_mix_activation()" to the asoc tree Mark Brown
2015-11-30  8:51 ` [PATCH 06/14] ASoC: rsnd: dvc: rename rsnd_dvc_soft_reset() to rsnd_dvc_activation() Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: dvc: rename rsnd_dvc_soft_reset() to rsnd_dvc_activation()" to the asoc tree Mark Brown
2015-11-30  8:51 ` [PATCH 07/14] ASoC: rsnd: src: add rsnd_src_halt() Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: src: add rsnd_src_halt()" to the asoc tree Mark Brown
2015-11-30  8:51 ` [PATCH 08/14] ASoC: rsnd: mix: add rsnd_mix_halt() Kuninori Morimoto
2015-12-01 22:59   ` Mark Brown [this message]
2015-11-30  8:52 ` [PATCH 09/14] ASoC: rsnd: dvc: add rsnd_dvc_halt() Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: dvc: add rsnd_dvc_halt()" to the asoc tree Mark Brown
2015-11-30  8:52 ` [PATCH 10/14] ASoC: rsnd: add rsnd_ssi_config_init() Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: add rsnd_ssi_config_init()" to the asoc tree Mark Brown
2015-11-30  8:53 ` [PATCH 11/14] ASoC: rsnd: set SSIWSR setting on rsnd_ssi_config_init() Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: set SSIWSR setting on rsnd_ssi_config_init()" to the asoc tree Mark Brown
2015-11-30  8:53 ` [PATCH 12/14] ASoC: rsnd: ssi enables non-stereo sound Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: ssi enables non-stereo sound" to the asoc tree Mark Brown
2015-11-30  8:53 ` [PATCH 13/14] ASoC: rsnd: dvc enables non-stereo sound Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: dvc enables non-stereo sound" to the asoc tree Mark Brown
2015-11-30  8:54 ` [PATCH 14/14] ASoC: rsnd: add TDM Extend Mode support Kuninori Morimoto
2015-12-01 22:59   ` Applied "ASoC: rsnd: add TDM Extend Mode support" to the asoc tree 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=E1a3tts-0006tp-TO@debutante \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=kuninori.morimoto.gx@renesas.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