All of 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: SSI/SSIU use rsnd_get_slot_extend() to check TDM" to the asoc tree
Date: Fri, 18 Dec 2015 12:15:26 +0000	[thread overview]
Message-ID: <E1a9twU-000652-Dc@debutante> (raw)
In-Reply-To: <877fkdiy48.wl%kuninori.morimoto.gx@renesas.com>

The patch

   ASoC: rsnd: SSI/SSIU use rsnd_get_slot_extend() to check TDM

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 49ee73b441f5734c3da254c60e134f343b89911a Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 17 Dec 2015 02:56:50 +0000
Subject: [PATCH] ASoC: rsnd: SSI/SSIU use rsnd_get_slot_extend() to check TDM

Current SSI/SSIU are using rsnd_get_slot_runtime() to check TDM,
but using rsnd_get_slot_extend() is more sane.
This patch fix it up

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sh/rcar/ssi.c  | 2 +-
 sound/soc/sh/rcar/ssiu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index 79c3211a1e7f..7481bc3e0dff 100644
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -267,7 +267,7 @@ static int rsnd_ssi_config_init(struct rsnd_ssi *ssi,
 	u32 wsr;
 	int is_tdm;
 
-	is_tdm = (rsnd_get_slot_runtime(io) >= 6) ? 1 : 0;
+	is_tdm = (rsnd_get_slot_extend(io) >= 6) ? 1 : 0;
 
 	/*
 	 * always use 32bit system word.
diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
index 326550114299..c7f89beff44f 100644
--- a/sound/soc/sh/rcar/ssiu.c
+++ b/sound/soc/sh/rcar/ssiu.c
@@ -78,7 +78,7 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
 	if (ret < 0)
 		return ret;
 
-	if (rsnd_get_slot_runtime(io) >= 6) {
+	if (rsnd_get_slot_extend(io) >= 6) {
 		/*
 		 * TDM Extend Mode
 		 * see
-- 
2.6.2

  reply	other threads:[~2015-12-18 12:15 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-17  2:52 [PATCH 0/12] ASoC: rsnd: add Multi channel support Kuninori Morimoto
2015-12-17  2:55 ` [PATCH 01/12] ASoC: rsnd: fixup SSIU control timing Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: fixup SSIU control timing" to the asoc tree Mark Brown
2015-12-17  2:55 ` [PATCH 02/12] ASoC: rsnd: tidyup return value of rsnd_get_adinr_bit() Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: tidyup return value of rsnd_get_adinr_bit()" to the asoc tree Mark Brown
2015-12-17  2:56 ` [PATCH 03/12] ASoC: rsnd: tidyup debug print position on rsnd_dma_attach() Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: tidyup debug print position on rsnd_dma_attach()" to the asoc tree Mark Brown
2015-12-17  2:56 ` [PATCH 04/12] ASoC: rsnd: rsnd_dai_connect() returns error if it connect to existing mod Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: rsnd_dai_connect() returns error if it connect to existing mod" to the asoc tree Mark Brown
2015-12-17  2:56 ` [PATCH 05/12] ASoC: rsnd: SSI/SSIU use rsnd_get_slot_extend() to check TDM Kuninori Morimoto
2015-12-18 12:15   ` Mark Brown [this message]
2015-12-17  2:57 ` [PATCH 06/12] ASoC: rsnd: remove rsnd_get_slot_runtime() Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: remove rsnd_get_slot_runtime()" to the asoc tree Mark Brown
2015-12-17  2:57 ` [PATCH 07/12] ASoC: rsnd: tidyup rsnd_get_slot_xxx() naming Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: tidyup rsnd_get_slot_xxx() naming" to the asoc tree Mark Brown
2015-12-17  2:57 ` [PATCH 08/12] ASoC: rsnd: add rsnd_set_slot() / rsnd_get_slot_num() Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: add rsnd_set_slot() / rsnd_get_slot_num()" to the asoc tree Mark Brown
2015-12-17  2:58 ` [PATCH 09/12] ASoC: rsnd: add rsnd_parse_connect_common() and remove complex macro Kuninori Morimoto
2015-12-18 12:15   ` Applied "ASoC: rsnd: add rsnd_parse_connect_common() and remove complex macro" to the asoc tree Mark Brown
     [not found] ` <87egeliyaz.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2015-12-17  2:59   ` [PATCH 10/12] ASoC: rsnd: add missing DT example for Simple Card Kuninori Morimoto
2015-12-18 12:15     ` Applied "ASoC: rsnd: add missing DT example for Simple Card" to the asoc tree Mark Brown
2015-12-18 20:16     ` [PATCH 10/12] ASoC: rsnd: add missing DT example for Simple Card Rob Herring
     [not found]     ` <87zix9hjfx.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2015-12-19  4:18       ` Rob Herring
2015-12-17  2:59   ` [PATCH 11/12] ASoC: rsnd: add missing DT example for Simple Card with TDM Kuninori Morimoto
2015-12-18 12:15     ` Applied "ASoC: rsnd: add missing DT example for Simple Card with TDM" to the asoc tree Mark Brown
2015-12-18 20:15     ` [PATCH 11/12] ASoC: rsnd: add missing DT example for Simple Card with TDM Rob Herring
     [not found]     ` <87y4cthjf9.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2015-12-19  4:18       ` Rob Herring
2015-12-17  3:00   ` [PATCH 12/12] ASoC: rsnd: add Multi channel support Kuninori Morimoto
2015-12-18 20:04     ` Rob Herring
2015-12-19 11:37       ` Mark Brown
     [not found]         ` <20151219113709.GG5727-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2015-12-22 18:47           ` Rob Herring
     [not found]     ` <87wpsdhje9.wl%kuninori.morimoto.gx-zM6kxYcvzFBBDgjK7y7TUQ@public.gmane.org>
2015-12-19  4:18       ` Rob Herring
2015-12-23  0:08     ` Applied "ASoC: rsnd: add Multi channel 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=E1a9twU-000652-Dc@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 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.