Groups > linux.kernel > #1198462

[PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode

From	"Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
Newsgroups	linux.kernel
Subject	[PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode
Date	2015-08-03 00:50 +0200
Message-ID	<pTaeS-Ud-9@gated-at.bofh.it> (permalink)
References	<pRXa1-19k-9@gated-at.bofh.it> <pSbwm-4Ye-9@gated-at.bofh.it> <pSkgh-19Y-13@gated-at.bofh.it> <pT6Eh-49c-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Adjust set DAI format function in fsl_ssi driver
so it doesn't fail and clears RXDIR in AC'97 mode.

Changes from v1: fix indentation to be consistent with rest
of the driver.

Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
---
 sound/soc/fsl/fsl_ssi.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 8e5ff5e..1ba63bd 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -900,14 +900,16 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
 		scr &= ~CCSR_SSI_SCR_SYS_CLK_EN;
 		break;
 	default:
-		return -EINVAL;
+		if (!fsl_ssi_is_ac97(ssi_private))
+			return -EINVAL;
 	}
 
 	stcr |= strcr;
 	srcr |= strcr;
 
-	if (ssi_private->cpu_dai_drv.symmetric_rates) {
-		/* Need to clear RXDIR when using SYNC mode */
+	if (ssi_private->cpu_dai_drv.symmetric_rates
+			|| fsl_ssi_is_ac97(ssi_private)) {
+		/* Need to clear RXDIR when using SYNC or AC97 mode */
 		srcr &= ~CCSR_SSI_SRCR_RXDIR;
 		scr |= CCSR_SSI_SCR_SYN;
 	}

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH 6/6] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> - 2015-07-30 16:40 +0200
  Re: [PATCH 6/6] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> - 2015-07-31 17:20 +0200
    Re: [PATCH 6/6] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode Markus Pargmann <mpa@pengutronix.de> - 2015-08-02 21:00 +0200
      [PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> - 2015-08-03 00:50 +0200
        Re: [PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode Mark Brown <broonie@kernel.org> - 2015-08-03 18:30 +0200
          Re: [PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97  mode "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> - 2015-08-04 00:50 +0200
            Re: [PATCH 6/6 v2] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode Mark Brown <broonie@kernel.org> - 2015-08-04 11:10 +0200

csiph-web