Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Pargmann <mpa@pengutronix.de>
To: Mark Brown <broonie@kernel.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>,
	alsa-devel@alsa-project.org, Alexander Shiyan <shc_work@mail.ru>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Timur Tabi <timur@tabi.org>,
	"Li.Xiubo@freescale.com" <Li.Xiubo@freescale.com>,
	kernel@pengutronix.de, Nicolin Chen <Guangyu.Chen@freescale.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 14/17] ASoC: fsl-ssi: Set framerate divider correctly for i2s master mode
Date: Mon, 28 Apr 2014 12:54:55 +0200	[thread overview]
Message-ID: <1398682498-24357-15-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1398682498-24357-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>
---
 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 5c6dc0a..01d97e2 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -686,6 +686,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;
-- 
1.9.1

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

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-28 10:54 [PATCH v4 00/17] ASoC: fsl-ssi: Driver cleanup Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 01/17] ASoC: fsl-ssi: Fix register values when disabling Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 02/17] ASoC: fsl-ssi: Move debugging to seperate file Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 03/17] ASoC: fsl-ssi: Use dev_name for DAI driver struct Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 04/17] ASoC: fsl-ssi: Move imx-specific probe to seperate function Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 05/17] ASoC: fsl-ssi: Remove useless DMA code Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 06/17] ASoC: fsl-ssi: Cleanup probe function Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 07/17] ASoC: fsl-ssi: Remove unnecessary variables from ssi_private Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 08/17] ASoC: fsl-ssi: introduce SoC specific data Markus Pargmann
2014-05-20 22:02   ` Mark Brown
2014-05-27  6:21     ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 09/17] ASoC: fsl-ssi: make fsl, mode property optional Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 10/17] ASoC: fsl-ssi: Transmit enable synchronization Markus Pargmann
2014-05-20 22:04   ` Mark Brown
2014-04-28 10:54 ` [PATCH v4 11/17] ASoC: fsl-ssi: Move fsl_ssi_set_dai_sysclk above fsl_ssi_hw_params Markus Pargmann
2014-05-20 22:05   ` Mark Brown
2014-04-28 10:54 ` [PATCH v4 12/17] ASoC: fsl-ssi: set bitclock in master mode from hw_params Markus Pargmann
2014-05-20 22:08   ` Mark Brown
2014-05-27  7:05     ` Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 13/17] ASoC: fsl-ssi: remove unnecessary spinlock Markus Pargmann
2014-04-28 10:54 ` Markus Pargmann [this message]
2014-04-28 10:54 ` [PATCH v4 15/17] ASoC: fsl-ssi: Fix baudclock handling Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 16/17] ASoC: fsl-ssi: reorder and document fsl_ssi_private Markus Pargmann
2014-04-28 10:54 ` [PATCH v4 17/17] ASoC: fsl-ssi: Use regmap Markus Pargmann
2014-04-28 21:43 ` [PATCH v4 00/17] ASoC: fsl-ssi: Driver cleanup Michael Grzeschik
2014-05-20 22:10 ` 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=1398682498-24357-15-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=Guangyu.Chen@freescale.com \
    --cc=Li.Xiubo@freescale.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=fabio.estevam@freescale.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shc_work@mail.ru \
    --cc=timur@tabi.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