From: Markus Pargmann <mpa@pengutronix.de> To: Mark Brown <broonie@kernel.org> Cc: Fabio Estevam <fabio.estevam@freescale.com>, alsa-devel@alsa-project.org, Timur Tabi <timur@tabi.org>, kernel@pengutronix.de, Nicolin Chen <Guangyu.Chen@freescale.com>, Markus Pargmann <mpa@pengutronix.de>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 14/16] ASoC: fsl-ssi: Transmit enable synchronization Date: Sat, 15 Mar 2014 13:44:22 +0100 [thread overview] Message-ID: <1394887464-969-15-git-send-email-mpa@pengutronix.de> (raw) In-Reply-To: <1394887464-969-1-git-send-email-mpa@pengutronix.de> When the fsl-ssi unit is used in i2s slave mode, it is possible that the SSI unit starts transmitting data on the wrong channel. This happens because the SSI does not synchronize with the left-right-clock by default. This patch enables transmit enable synchronization. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- sound/soc/fsl/fsl_ssi.c | 1 + sound/soc/fsl/fsl_ssi.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index bb6d607..6095a15 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -615,6 +615,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private, fsl_ssi_setup_reg_vals(ssi_private); scr = read_ssi(&ssi->scr) & ~(CCSR_SSI_SCR_SYN | CCSR_SSI_SCR_I2S_MODE_MASK); + scr |= CCSR_SSI_SCR_SYNC_TX_FS; mask = CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFDIR | CCSR_SSI_STCR_TXDIR | CCSR_SSI_STCR_TSCKP | CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TFSL | diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h index 2e95dd7..71c3e7e 100644 --- a/sound/soc/fsl/fsl_ssi.h +++ b/sound/soc/fsl/fsl_ssi.h @@ -39,6 +39,7 @@ struct ccsr_ssi { __be32 saccdis; /* 0x.0058 - SSI AC97 Channel Disable Register */ }; +#define CCSR_SSI_SCR_SYNC_TX_FS 0x00001000 #define CCSR_SSI_SCR_RFR_CLK_DIS 0x00000800 #define CCSR_SSI_SCR_TFR_CLK_DIS 0x00000400 #define CCSR_SSI_SCR_TCH_EN 0x00000100 -- 1.9.0
WARNING: multiple messages have this Message-ID (diff)
From: mpa@pengutronix.de (Markus Pargmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 14/16] ASoC: fsl-ssi: Transmit enable synchronization Date: Sat, 15 Mar 2014 13:44:22 +0100 [thread overview] Message-ID: <1394887464-969-15-git-send-email-mpa@pengutronix.de> (raw) In-Reply-To: <1394887464-969-1-git-send-email-mpa@pengutronix.de> When the fsl-ssi unit is used in i2s slave mode, it is possible that the SSI unit starts transmitting data on the wrong channel. This happens because the SSI does not synchronize with the left-right-clock by default. This patch enables transmit enable synchronization. Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- sound/soc/fsl/fsl_ssi.c | 1 + sound/soc/fsl/fsl_ssi.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index bb6d607..6095a15 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -615,6 +615,7 @@ static int _fsl_ssi_set_dai_fmt(struct fsl_ssi_private *ssi_private, fsl_ssi_setup_reg_vals(ssi_private); scr = read_ssi(&ssi->scr) & ~(CCSR_SSI_SCR_SYN | CCSR_SSI_SCR_I2S_MODE_MASK); + scr |= CCSR_SSI_SCR_SYNC_TX_FS; mask = CCSR_SSI_STCR_TXBIT0 | CCSR_SSI_STCR_TFDIR | CCSR_SSI_STCR_TXDIR | CCSR_SSI_STCR_TSCKP | CCSR_SSI_STCR_TFSI | CCSR_SSI_STCR_TFSL | diff --git a/sound/soc/fsl/fsl_ssi.h b/sound/soc/fsl/fsl_ssi.h index 2e95dd7..71c3e7e 100644 --- a/sound/soc/fsl/fsl_ssi.h +++ b/sound/soc/fsl/fsl_ssi.h @@ -39,6 +39,7 @@ struct ccsr_ssi { __be32 saccdis; /* 0x.0058 - SSI AC97 Channel Disable Register */ }; +#define CCSR_SSI_SCR_SYNC_TX_FS 0x00001000 #define CCSR_SSI_SCR_RFR_CLK_DIS 0x00000800 #define CCSR_SSI_SCR_TFR_CLK_DIS 0x00000400 #define CCSR_SSI_SCR_TCH_EN 0x00000100 -- 1.9.0
next prev parent reply other threads:[~2014-03-15 12:45 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-15 12:44 [PATCH v2 00/16] ASoC: fsl-ssi: Driver cleanup Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 01/16] ASoC: fsl-ssi: Remove fsl_ssi_setup Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 02/16] ASoC: fsl-ssi: Fix i2s_mode variable setup Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 03/16] ASoC: fsl-ssi: Move debugging to seperate file Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 04/16] ASoC: fsl-ssi: Use dev_name for DAI driver struct Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 05/16] ASoC: fsl-ssi: Move imx-specific probe to seperate function Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 06/16] ASoC: fsl-ssi: Remove useless DMA code Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 07/16] ASoC: fsl-ssi: baud clock error handling Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 08/16] ASoC: fsl-ssi: Cleanup probe function Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 09/16] ASoC: fsl-ssi: Remove unnecessary variables from ssi_private Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 10/16] ASoC: fsl-ssi: reorder and document fsl_ssi_private Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 11/16] ASoC: fsl-ssi: Fix register values when disabling Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-04-03 22:11 ` Mark Brown 2014-04-03 22:11 ` Mark Brown 2014-04-04 6:52 ` Markus Pargmann 2014-04-04 6:52 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 12/16] ASoC: fsl-ssi: Only enable baudclk when used Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 13/16] ASoC: fsl-ssi: Set default dai-fmts Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann [this message] 2014-03-15 12:44 ` [PATCH v2 14/16] ASoC: fsl-ssi: Transmit enable synchronization Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 15/16] ASoC: fsl-ssi: Update binding documentation Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 12:44 ` [PATCH v2 16/16] ASoC: fsl-ssi: Use regmap Markus Pargmann 2014-03-15 12:44 ` Markus Pargmann 2014-03-15 14:43 ` Alexander Shiyan 2014-03-15 14:43 ` Alexander Shiyan 2014-03-18 8:10 ` Markus Pargmann 2014-03-18 8:10 ` Markus Pargmann 2014-03-20 6:07 ` Li.Xiubo 2014-03-20 6:07 ` Li.Xiubo at freescale.com 2014-03-20 15:10 ` Timur Tabi 2014-03-20 15:10 ` Timur Tabi 2014-03-21 1:52 ` Li.Xiubo 2014-03-21 1:52 ` Li.Xiubo at freescale.com 2014-03-21 8:45 ` Markus Pargmann 2014-03-21 8:45 ` Markus Pargmann 2014-03-21 9:19 ` Li.Xiubo 2014-03-21 9:19 ` Li.Xiubo at freescale.com 2014-03-18 12:44 ` [PATCH v2 00/16] ASoC: fsl-ssi: Driver cleanup Mark Brown 2014-03-18 12:44 ` Mark Brown 2014-04-03 22:14 ` Mark Brown 2014-04-03 22:14 ` Mark Brown 2014-04-04 6:49 ` Markus Pargmann 2014-04-04 6:49 ` Markus Pargmann 2014-04-04 7:58 ` [alsa-devel] " Michael Trimarchi 2014-04-04 7:58 ` Michael Trimarchi 2014-04-04 10:59 ` Markus Pargmann 2014-04-04 10:59 ` [alsa-devel] " Markus Pargmann 2014-04-04 12:59 ` Michael Trimarchi 2014-04-04 12:59 ` [alsa-devel] " Michael Trimarchi 2014-04-04 10:03 ` Mark Brown 2014-04-04 10:03 ` Mark Brown 2014-04-04 10:51 ` Markus Pargmann 2014-04-04 10:51 ` Markus Pargmann
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=1394887464-969-15-git-send-email-mpa@pengutronix.de \ --to=mpa@pengutronix.de \ --cc=Guangyu.Chen@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=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: linkBe 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.