linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xiubo Li <Li.Xiubo@freescale.com>
To: <broonie@kernel.org>, <lgirdwood@gmail.com>
Cc: <timur@tabi.org>, <tiwai@suse.de>, <lars@metafoo.de>,
	<Guangyu.Chen@freescale.com>, <fabio.estevam@freescale.com>,
	<shawn.guo@linaro.org>, <denis@eukrea.com>, <mpa@pengutronix.de>,
	<s.hauer@pengutronix.de>, <moinejf@free.fr>,
	<kuninori.morimoto.gx@renesas.com>, <alsa-devel@alsa-project.org>,
	<linux-kernel@vger.kernel.org>, Xiubo Li <Li.Xiubo@freescale.com>
Subject: [PATCH 06/10] ASoC: simple-card: Use snd_soc_dai_set_tdm_slot_xlate()
Date: Wed, 26 Feb 2014 11:59:31 +0800	[thread overview]
Message-ID: <1393387175-15539-7-git-send-email-Li.Xiubo@freescale.com> (raw)
In-Reply-To: <1393387175-15539-1-git-send-email-Li.Xiubo@freescale.com>

Use snd_soc_dai_set_tdm_slot_xlate instead of snd_soc_dai_set_tdm_slot.

This will use the DAI driver specified .of_xlate_tdm_slot_mask to generate
the TDM slot TX/RX mask, or the default snd_soc_of_xlate_tdm_slot_mask will
be used instead if it's absent.

Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com>
---
 sound/soc/generic/simple-card.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index bdd176d..22efa83 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -48,11 +48,10 @@ static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
 	}
 
 	if (set->slots) {
-		ret = snd_soc_dai_set_tdm_slot(dai, 0, 0,
-						set->slots,
-						set->slot_width);
+		ret = snd_soc_dai_set_tdm_slot_xlate(dai, set->slots,
+						     set->slot_width);
 		if (ret && ret != -ENOTSUPP) {
-			dev_err(dai->dev, "simple-card: set_tdm_slot error\n");
+			dev_err(dai->dev, "simple-card: set_tdm_slot_xlate error\n");
 			goto err;
 		}
 	}
-- 
1.8.4



  parent reply	other threads:[~2014-02-26  5:09 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-26  3:59 [PATCH 00/10] Simplify the code of TDM slot setting Xiubo Li
2014-02-26  3:59 ` [PATCH 01/10] ASoC: core: Add snd_soc_dai_set_tdm_slot_xlate() Xiubo Li
2014-03-01 13:19   ` [alsa-devel] " Lars-Peter Clausen
2014-03-05  3:39     ` Mark Brown
2014-03-05  3:55       ` Li.Xiubo
2014-03-05  6:30         ` Mark Brown
2014-02-26  3:59 ` [PATCH 02/10] ASoC: fsl-utils: Add fsl_asoc_of_xlate_tdm_slot_mask() support Xiubo Li
2014-02-26  3:59 ` [PATCH 03/10] ASoC: fsl-esai: Add .of_xlate_tdm_slot_mask() support Xiubo Li
2014-02-26  3:59 ` [PATCH 04/10] ASoC: fsl-ssi: " Xiubo Li
2014-02-26  3:59 ` [PATCH 05/10] ASoC: imx-ssi: " Xiubo Li
2014-02-26  3:59 ` Xiubo Li [this message]
2014-02-26  3:59 ` [PATCH 07/10] ASoC: blackfin: bf5xx-ad1836: Use snd_soc_dai_set_tdm_slot_xlate() Xiubo Li
2014-02-26  3:59 ` [PATCH 08/10] ASoC: blackfin: bf5xx-ad193x: " Xiubo Li
2014-02-26  3:59 ` [PATCH 09/10] ASoC: fsl: eukrea-tlv320: " Xiubo Li
2014-02-26  3:59 ` [PATCH 10/10] ASoC: fsl: wm1133-ev1: " Xiubo Li

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=1393387175-15539-7-git-send-email-Li.Xiubo@freescale.com \
    --to=li.xiubo@freescale.com \
    --cc=Guangyu.Chen@freescale.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=denis@eukrea.com \
    --cc=fabio.estevam@freescale.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lars@metafoo.de \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=moinejf@free.fr \
    --cc=mpa@pengutronix.de \
    --cc=s.hauer@pengutronix.de \
    --cc=shawn.guo@linaro.org \
    --cc=timur@tabi.org \
    --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;
as well as URLs for NNTP newsgroup(s).