diff mbox

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

Message ID 55BE9D3B.3090303@maciej.szmigiero.name (mailing list archive)
State Accepted
Commit dce0332c85c4d9eb5d96182c56f63cd20566f073
Headers show

Commit Message

Maciej S. Szmigiero Aug. 2, 2015, 10:44 p.m. UTC
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(-)

Comments

Mark Brown Aug. 3, 2015, 4:21 p.m. UTC | #1
On Mon, Aug 03, 2015 at 12:44:11AM +0200, Maciej S. Szmigiero wrote:
> 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.

Inter version changelogs go after the --- as covered in
SubmittingPatches.

> 
> Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>

Please don't bury new patches in reply to old submissions, especially
not individual patches - it makes it hard to work out what's going on
and make sure that the most current version of everything is being
applied.  In order to avoid confusion I'm not going to look at these,
please resubmit as a new thread.

Please also try to thread your patch series together (git send-email can
do this for you) - it also helps people keep track of things.
Maciej S. Szmigiero Aug. 3, 2015, 10:42 p.m. UTC | #2
On 03.08.2015 18:21, Mark Brown wrote:
> On Mon, Aug 03, 2015 at 12:44:11AM +0200, Maciej S. Szmigiero wrote:
>> 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.
> 
> Inter version changelogs go after the --- as covered in
> SubmittingPatches.
> 
>>
>> Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
> 
> Please don't bury new patches in reply to old submissions, especially
> not individual patches - it makes it hard to work out what's going on
> and make sure that the most current version of everything is being
> applied.  In order to avoid confusion I'm not going to look at these,
> please resubmit as a new thread.
> 
> Please also try to thread your patch series together (git send-email can
> do this for you) - it also helps people keep track of things.

Thanks for information.

In cases like this where only one patch of six patch series is updated
should other ones be resubmitted as well to keep the full patch series
together?

Best regards,
Maciej Szmigiero
Mark Brown Aug. 4, 2015, 9:07 a.m. UTC | #3
On Tue, Aug 04, 2015 at 12:42:48AM +0200, Maciej S. Szmigiero wrote:

> In cases like this where only one patch of six patch series is updated
> should other ones be resubmitted as well to keep the full patch series
> together?

Yes, any unapplied patches should be resubmitted.
diff mbox

Patch

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;
 	}