[alsa-devel] [PATCH 6/6] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode
Adjust set DAI format function in fsl_ssi driver so it doesn't fail and clears RXDIR in AC'97 mode.
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..37aabe3 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; }
On Thu, Jul 30, 2015 at 04:35:58PM +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.
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..37aabe3 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;
I think it would be better to add another case for the other mode which is supported (AC97) instead of using the default case.
}
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)) {
Please fix this indention. Most of the driver is written with 2 tab indention after a line break and the new policy seems to be to indent on the opening bracket.
Regards,
Markus
/* Need to clear RXDIR when using SYNC or AC97 mode */-- 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/
On 31.07.2015 07:58, Markus Pargmann wrote:
On Thu, Jul 30, 2015 at 04:35:58PM +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.
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..37aabe3 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;I think it would be better to add another case for the other mode which is supported (AC97) instead of using the default case.
This is a switch of DAI clock masters and AC'97 is none of them: while "case 0:" can be added this would be very similar to the current code.
Alternatively, the whole switch statement could be wrapped inside "if (!fsl_ssi_is_ac97(ssi_private))" if that would be better with regards to code style.
}
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)) {Please fix this indention. Most of the driver is written with 2 tab indention after a line break and the new policy seems to be to indent on the opening bracket.
Will reindent this.
Regards,
Markus
Best regards, Maciej Szmigiero
On Fri, Jul 31, 2015 at 05:13:06PM +0200, Maciej S. Szmigiero wrote:
On 31.07.2015 07:58, Markus Pargmann wrote:
On Thu, Jul 30, 2015 at 04:35:58PM +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.
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..37aabe3 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;I think it would be better to add another case for the other mode which is supported (AC97) instead of using the default case.
This is a switch of DAI clock masters and AC'97 is none of them: while "case 0:" can be added this would be very similar to the current code.
Alternatively, the whole switch statement could be wrapped inside "if (!fsl_ssi_is_ac97(ssi_private))" if that would be better with regards to code style.
I looked at the wrong switch/case the DAIFMT_AC97 is actually used but this patch is about the master clocks. It's fine then.
Thanks,
Markus
}
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)) {Please fix this indention. Most of the driver is written with 2 tab indention after a line break and the new policy seems to be to indent on the opening bracket.
Will reindent this.
Regards,
Markus
Best regards, Maciej Szmigiero
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; }
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.
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
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.
The patch
ASoC: fsl_ssi: adjust set DAI format in AC'97 mode
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From dce0332c85c4d9eb5d96182c56f63cd20566f073 Mon Sep 17 00:00:00 2001
From: "Maciej S. Szmigiero" mail@maciej.szmigiero.name Date: Wed, 5 Aug 2015 17:29:02 +0200 Subject: [PATCH] ASoC: fsl_ssi: adjust set DAI format in AC'97 mode
Adjust set DAI format function in fsl_ssi driver so it doesn't fail and clears RXDIR in AC'97 mode.
Signed-off-by: Maciej Szmigiero mail@maciej.szmigiero.name Signed-off-by: Mark Brown broonie@kernel.org --- sound/soc/fsl/fsl_ssi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index e79dc16..f03d57e 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; }
Adjust set DAI format function in fsl_ssi driver so it doesn't fail and clears RXDIR in AC'97 mode.
Signed-off-by: Maciej Szmigiero mail@maciej.szmigiero.name --- Changes from v1: fix indentation to be consistent with rest of the driver.
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; }
participants (3)
-
Maciej S. Szmigiero -
Mark Brown -
Markus Pargmann