From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 5/8] ASoC: fsl-ssi: Set framerate divider correctly for i2s master mode
Date: Tue, 27 May 2014 10:24:22 +0200 [thread overview]
Message-ID: <1401179065-31195-6-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1401179065-31195-1-git-send-email-mpa@pengutronix.de>
From: Sascha Hauer <s.hauer@pengutronix.de>
In i2s master mode the fsl_ssi driver depends on someone calling
.set_tdm_slot correctly. In this mode though only a DC value of
2 is allowed, so set it in this case and no longer depend on
.set_tdm_slot.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-By: Michael Grzeschik <mgr@pengutronix.de>
---
sound/soc/fsl/fsl_ssi.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index b3033d9..dbcde10 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -709,6 +709,10 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private,
switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
case SND_SOC_DAIFMT_CBS_CFS:
ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_MASTER;
+ write_ssi_mask(&ssi->stccr, CCSR_SSI_SxCCR_DC_MASK,
+ CCSR_SSI_SxCCR_DC(2));
+ write_ssi_mask(&ssi->srccr, CCSR_SSI_SxCCR_DC_MASK,
+ CCSR_SSI_SxCCR_DC(2));
break;
case SND_SOC_DAIFMT_CBM_CFM:
ssi_private->i2s_mode |= CCSR_SSI_SCR_I2S_MODE_SLAVE;
--
2.0.0.rc2
next prev parent reply other threads:[~2014-05-27 8:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-27 8:24 [PATCH v5 0/8] ASoC: fsl-ssi: Driver cleanup Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 1/8] ASoC: fsl-ssi: introduce SoC specific data Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 2/8] ASoC: fsl-ssi: make fsl,mode property optional Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 3/8] ASoC: fsl-ssi: set bitclock in master mode from hw_params Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 4/8] ASoC: fsl-ssi: remove unnecessary spinlock Markus Pargmann
2014-05-27 8:24 ` Markus Pargmann [this message]
2014-05-27 8:24 ` [PATCH v5 6/8] ASoC: fsl-ssi: Fix baudclock handling Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 7/8] ASoC: fsl-ssi: reorder and document fsl_ssi_private Markus Pargmann
2014-05-27 8:24 ` [PATCH v5 8/8] ASoC: fsl-ssi: Use regmap Markus Pargmann
2014-06-01 10:55 ` [PATCH v5 0/8] ASoC: fsl-ssi: Driver cleanup 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=1401179065-31195-6-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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).