* [PATCH v1 1/3] ASoC: cygnus: Add EXPORT_SYMBOL for helper function
2017-09-28 22:29 [PATCH v1 0/3] Minor updates to driver Lori Hikichi
@ 2017-09-28 22:29 ` Lori Hikichi
2017-09-28 22:29 ` [PATCH INTERNAL 1/1] ASoC: cygnus: Remove set_fmt from SPDIF dai ops Lori Hikichi
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Lori Hikichi @ 2017-09-28 22:29 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Ray Jui,
Scott Branden, Jon Mason, bcm-kernel-feedback-list
Cc: alsa-devel, linux-arm-kernel, linux-kernel, Lori Hikichi
The helper function cygnus_ssp_set_custom_fsync_width() is intended
to be called from an ASoC machine driver, need to export symbol
if using modules.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
---
sound/soc/bcm/cygnus-ssp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index 15c438f..e9c73a4 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -842,6 +842,7 @@ int cygnus_ssp_set_custom_fsync_width(struct snd_soc_dai *cpu_dai, int len)
return -EINVAL;
}
}
+EXPORT_SYMBOL_GPL(cygnus_ssp_set_custom_fsync_width);
static int cygnus_ssp_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt)
{
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH INTERNAL 1/1] ASoC: cygnus: Remove set_fmt from SPDIF dai ops
2017-09-28 22:29 [PATCH v1 0/3] Minor updates to driver Lori Hikichi
2017-09-28 22:29 ` [PATCH v1 1/3] ASoC: cygnus: Add EXPORT_SYMBOL for helper function Lori Hikichi
@ 2017-09-28 22:29 ` Lori Hikichi
2017-09-28 23:50 ` Lori Hikichi
2017-10-04 11:27 ` Applied "ASoC: cygnus: Remove set_fmt from SPDIF dai ops" to the asoc tree Mark Brown
2017-09-28 22:29 ` [PATCH v1 2/3] ASoC: cygnus: Remove set_fmt from SPDIF dai ops Lori Hikichi
2017-09-28 22:29 ` [PATCH v1 3/3] ASoC: cygnus: Remove support for 8 bit audio and for mono Lori Hikichi
3 siblings, 2 replies; 8+ messages in thread
From: Lori Hikichi @ 2017-09-28 22:29 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Ray Jui,
Scott Branden, Jon Mason, bcm-kernel-feedback-list
Cc: alsa-devel, linux-arm-kernel, linux-kernel, Lori Hikichi
The SPDIF port cannot modify its format so a set_fmt function is not
needed. Previously, we used a generic set_fmt for all ports and returned
an error code for the SPDIF port. It is cleaner to not populate the
set_fmt field.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
---
sound/soc/bcm/cygnus-ssp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index 15c438f..b9a3bb8d 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1136,6 +1136,13 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
.set_tdm_slot = cygnus_set_dai_tdm_slot,
};
+static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
+ .startup = cygnus_ssp_startup,
+ .shutdown = cygnus_ssp_shutdown,
+ .trigger = cygnus_ssp_trigger,
+ .hw_params = cygnus_ssp_hw_params,
+ .set_sysclk = cygnus_ssp_set_sysclk,
+};
#define INIT_CPU_DAI(num) { \
.name = "cygnus-ssp" #num, \
@@ -1174,7 +1181,7 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE,
},
- .ops = &cygnus_ssp_dai_ops,
+ .ops = &cygnus_spdif_dai_ops,
.suspend = cygnus_ssp_suspend,
.resume = cygnus_ssp_resume,
};
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH INTERNAL 1/1] ASoC: cygnus: Remove set_fmt from SPDIF dai ops
2017-09-28 22:29 ` [PATCH INTERNAL 1/1] ASoC: cygnus: Remove set_fmt from SPDIF dai ops Lori Hikichi
@ 2017-09-28 23:50 ` Lori Hikichi
2017-10-04 11:27 ` Applied "ASoC: cygnus: Remove set_fmt from SPDIF dai ops" to the asoc tree Mark Brown
1 sibling, 0 replies; 8+ messages in thread
From: Lori Hikichi @ 2017-09-28 23:50 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Ray Jui,
Scott Branden, Jon Mason, bcm-kernel-feedback-list
Cc: alsa-devel, linux-arm-kernel, linux-kernel
On 9/28/2017 3:29 PM, Lori Hikichi wrote:
> The SPDIF port cannot modify its format so a set_fmt function is not
> needed. Previously, we used a generic set_fmt for all ports and returned
> an error code for the SPDIF port. It is cleaner to not populate the
> set_fmt field.
>
> Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
> ---
> sound/soc/bcm/cygnus-ssp.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
> index 15c438f..b9a3bb8d 100644
> --- a/sound/soc/bcm/cygnus-ssp.c
> +++ b/sound/soc/bcm/cygnus-ssp.c
> @@ -1136,6 +1136,13 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
> .set_tdm_slot = cygnus_set_dai_tdm_slot,
> };
>
> +static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
> + .startup = cygnus_ssp_startup,
> + .shutdown = cygnus_ssp_shutdown,
> + .trigger = cygnus_ssp_trigger,
> + .hw_params = cygnus_ssp_hw_params,
> + .set_sysclk = cygnus_ssp_set_sysclk,
> +};
>
> #define INIT_CPU_DAI(num) { \
> .name = "cygnus-ssp" #num, \
> @@ -1174,7 +1181,7 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
> .formats = SNDRV_PCM_FMTBIT_S16_LE |
> SNDRV_PCM_FMTBIT_S32_LE,
> },
> - .ops = &cygnus_ssp_dai_ops,
> + .ops = &cygnus_spdif_dai_ops,
> .suspend = cygnus_ssp_suspend,
> .resume = cygnus_ssp_resume,
> };
Please ignore this patch. It was accidentally included in the patch set and is a
duplicate of another patch already in the patch set.
^ permalink raw reply [flat|nested] 8+ messages in thread* Applied "ASoC: cygnus: Remove set_fmt from SPDIF dai ops" to the asoc tree
2017-09-28 22:29 ` [PATCH INTERNAL 1/1] ASoC: cygnus: Remove set_fmt from SPDIF dai ops Lori Hikichi
2017-09-28 23:50 ` Lori Hikichi
@ 2017-10-04 11:27 ` Mark Brown
1 sibling, 0 replies; 8+ messages in thread
From: Mark Brown @ 2017-10-04 11:27 UTC (permalink / raw)
To: Lori Hikichi; +Cc: Mark Brown, Liam Girdwood
The patch
ASoC: cygnus: Remove set_fmt from SPDIF dai ops
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 fcf30f3b4377d2475aa709ce28964461990c3caa Mon Sep 17 00:00:00 2001
From: Lori Hikichi <lori.hikichi@broadcom.com>
Date: Thu, 28 Sep 2017 15:29:34 -0700
Subject: [PATCH] ASoC: cygnus: Remove set_fmt from SPDIF dai ops
The SPDIF port cannot modify its format so a set_fmt function is not
needed. Previously, we used a generic set_fmt for all ports and returned
an error code for the SPDIF port. It is cleaner to not populate the
set_fmt field.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/bcm/cygnus-ssp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index e9c73a451cf6..da14facb8a6f 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1137,6 +1137,13 @@ static const struct snd_soc_dai_ops cygnus_ssp_dai_ops = {
.set_tdm_slot = cygnus_set_dai_tdm_slot,
};
+static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
+ .startup = cygnus_ssp_startup,
+ .shutdown = cygnus_ssp_shutdown,
+ .trigger = cygnus_ssp_trigger,
+ .hw_params = cygnus_ssp_hw_params,
+ .set_sysclk = cygnus_ssp_set_sysclk,
+};
#define INIT_CPU_DAI(num) { \
.name = "cygnus-ssp" #num, \
@@ -1175,7 +1182,7 @@ static const struct snd_soc_dai_driver cygnus_spdif_dai_info = {
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE,
},
- .ops = &cygnus_ssp_dai_ops,
+ .ops = &cygnus_spdif_dai_ops,
.suspend = cygnus_ssp_suspend,
.resume = cygnus_ssp_resume,
};
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v1 2/3] ASoC: cygnus: Remove set_fmt from SPDIF dai ops
2017-09-28 22:29 [PATCH v1 0/3] Minor updates to driver Lori Hikichi
2017-09-28 22:29 ` [PATCH v1 1/3] ASoC: cygnus: Add EXPORT_SYMBOL for helper function Lori Hikichi
2017-09-28 22:29 ` [PATCH INTERNAL 1/1] ASoC: cygnus: Remove set_fmt from SPDIF dai ops Lori Hikichi
@ 2017-09-28 22:29 ` Lori Hikichi
2017-09-28 22:29 ` [PATCH v1 3/3] ASoC: cygnus: Remove support for 8 bit audio and for mono Lori Hikichi
3 siblings, 0 replies; 8+ messages in thread
From: Lori Hikichi @ 2017-09-28 22:29 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Ray Jui,
Scott Branden, Jon Mason, bcm-kernel-feedback-list
Cc: alsa-devel, linux-arm-kernel, linux-kernel, Lori Hikichi
The SPDIF port cannot modify its format so a set_fmt function is not
needed. Previously, we used a generic set_fmt for all ports and returned
an error code for the SPDIF port. It is cleaner to not populate the
set_fmt field.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
---
sound/soc/bcm/cygnus-ssp.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index e9c73a4..da14fac 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -1137,6 +1137,13 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
.set_tdm_slot = cygnus_set_dai_tdm_slot,
};
+static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
+ .startup = cygnus_ssp_startup,
+ .shutdown = cygnus_ssp_shutdown,
+ .trigger = cygnus_ssp_trigger,
+ .hw_params = cygnus_ssp_hw_params,
+ .set_sysclk = cygnus_ssp_set_sysclk,
+};
#define INIT_CPU_DAI(num) { \
.name = "cygnus-ssp" #num, \
@@ -1175,7 +1182,7 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
.formats = SNDRV_PCM_FMTBIT_S16_LE |
SNDRV_PCM_FMTBIT_S32_LE,
},
- .ops = &cygnus_ssp_dai_ops,
+ .ops = &cygnus_spdif_dai_ops,
.suspend = cygnus_ssp_suspend,
.resume = cygnus_ssp_resume,
};
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v1 3/3] ASoC: cygnus: Remove support for 8 bit audio and for mono
2017-09-28 22:29 [PATCH v1 0/3] Minor updates to driver Lori Hikichi
` (2 preceding siblings ...)
2017-09-28 22:29 ` [PATCH v1 2/3] ASoC: cygnus: Remove set_fmt from SPDIF dai ops Lori Hikichi
@ 2017-09-28 22:29 ` Lori Hikichi
2017-10-04 11:27 ` Applied "ASoC: cygnus: Remove support for 8 bit audio and for mono" to the asoc tree Mark Brown
3 siblings, 1 reply; 8+ messages in thread
From: Lori Hikichi @ 2017-09-28 22:29 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Ray Jui,
Scott Branden, Jon Mason, bcm-kernel-feedback-list
Cc: alsa-devel, linux-arm-kernel, linux-kernel, Lori Hikichi
These modes of operation were not working properly and it is
unclear if the hardware could fully support these modes properly.
There is little to be gained by enabling these modes, therefore,
we will just remove support.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
---
sound/soc/bcm/cygnus-ssp.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index da14fac..cd8aef8 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -655,23 +655,10 @@ static int cygnus_ssp_hw_params(struct snd_pcm_substream *substream,
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
value = readl(aio->cygaud->audio + aio->regs.bf_sourcech_cfg);
value &= ~BIT(BF_SRC_CFGX_BUFFER_PAIR_ENABLE);
- /* Configure channels as mono or stereo/TDM */
- if (params_channels(params) == 1)
- value |= BIT(BF_SRC_CFGX_SAMPLE_CH_MODE);
- else
- value &= ~BIT(BF_SRC_CFGX_SAMPLE_CH_MODE);
+ value &= ~BIT(BF_SRC_CFGX_SAMPLE_CH_MODE);
writel(value, aio->cygaud->audio + aio->regs.bf_sourcech_cfg);
switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S8:
- if (aio->port_type == PORT_SPDIF) {
- dev_err(aio->cygaud->dev,
- "SPDIF does not support 8bit format\n");
- return -EINVAL;
- }
- bitres = 8;
- break;
-
case SNDRV_PCM_FORMAT_S16_LE:
bitres = 16;
break;
@@ -1148,11 +1135,10 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
#define INIT_CPU_DAI(num) { \
.name = "cygnus-ssp" #num, \
.playback = { \
- .channels_min = 1, \
+ .channels_min = 2, \
.channels_max = 16, \
.rates = SNDRV_PCM_RATE_KNOT, \
- .formats = SNDRV_PCM_FMTBIT_S8 | \
- SNDRV_PCM_FMTBIT_S16_LE | \
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S32_LE, \
}, \
.capture = { \
@@ -1160,7 +1146,7 @@ static int cygnus_ssp_resume(struct snd_soc_dai *cpu_dai)
.channels_max = 16, \
.rates = SNDRV_PCM_RATE_KNOT, \
.formats = SNDRV_PCM_FMTBIT_S16_LE | \
- SNDRV_PCM_FMTBIT_S32_LE, \
+ SNDRV_PCM_FMTBIT_S32_LE, \
}, \
.ops = &cygnus_ssp_dai_ops, \
.suspend = cygnus_ssp_suspend, \
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Applied "ASoC: cygnus: Remove support for 8 bit audio and for mono" to the asoc tree
2017-09-28 22:29 ` [PATCH v1 3/3] ASoC: cygnus: Remove support for 8 bit audio and for mono Lori Hikichi
@ 2017-10-04 11:27 ` Mark Brown
0 siblings, 0 replies; 8+ messages in thread
From: Mark Brown @ 2017-10-04 11:27 UTC (permalink / raw)
To: Lori Hikichi; +Cc: Mark Brown, Liam Girdwood
The patch
ASoC: cygnus: Remove support for 8 bit audio and for mono
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 934e4885cb958566a34124e5a1dad2f9212a8ec6 Mon Sep 17 00:00:00 2001
From: Lori Hikichi <lori.hikichi@broadcom.com>
Date: Thu, 28 Sep 2017 15:29:35 -0700
Subject: [PATCH] ASoC: cygnus: Remove support for 8 bit audio and for mono
These modes of operation were not working properly and it is
unclear if the hardware could fully support these modes properly.
There is little to be gained by enabling these modes, therefore,
we will just remove support.
Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/bcm/cygnus-ssp.c | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/sound/soc/bcm/cygnus-ssp.c b/sound/soc/bcm/cygnus-ssp.c
index da14facb8a6f..cd8aef8ed8a5 100644
--- a/sound/soc/bcm/cygnus-ssp.c
+++ b/sound/soc/bcm/cygnus-ssp.c
@@ -655,23 +655,10 @@ static int cygnus_ssp_hw_params(struct snd_pcm_substream *substream,
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
value = readl(aio->cygaud->audio + aio->regs.bf_sourcech_cfg);
value &= ~BIT(BF_SRC_CFGX_BUFFER_PAIR_ENABLE);
- /* Configure channels as mono or stereo/TDM */
- if (params_channels(params) == 1)
- value |= BIT(BF_SRC_CFGX_SAMPLE_CH_MODE);
- else
- value &= ~BIT(BF_SRC_CFGX_SAMPLE_CH_MODE);
+ value &= ~BIT(BF_SRC_CFGX_SAMPLE_CH_MODE);
writel(value, aio->cygaud->audio + aio->regs.bf_sourcech_cfg);
switch (params_format(params)) {
- case SNDRV_PCM_FORMAT_S8:
- if (aio->port_type == PORT_SPDIF) {
- dev_err(aio->cygaud->dev,
- "SPDIF does not support 8bit format\n");
- return -EINVAL;
- }
- bitres = 8;
- break;
-
case SNDRV_PCM_FORMAT_S16_LE:
bitres = 16;
break;
@@ -1148,11 +1135,10 @@ static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
#define INIT_CPU_DAI(num) { \
.name = "cygnus-ssp" #num, \
.playback = { \
- .channels_min = 1, \
+ .channels_min = 2, \
.channels_max = 16, \
.rates = SNDRV_PCM_RATE_KNOT, \
- .formats = SNDRV_PCM_FMTBIT_S8 | \
- SNDRV_PCM_FMTBIT_S16_LE | \
+ .formats = SNDRV_PCM_FMTBIT_S16_LE | \
SNDRV_PCM_FMTBIT_S32_LE, \
}, \
.capture = { \
@@ -1160,7 +1146,7 @@ static const struct snd_soc_dai_ops cygnus_spdif_dai_ops = {
.channels_max = 16, \
.rates = SNDRV_PCM_RATE_KNOT, \
.formats = SNDRV_PCM_FMTBIT_S16_LE | \
- SNDRV_PCM_FMTBIT_S32_LE, \
+ SNDRV_PCM_FMTBIT_S32_LE, \
}, \
.ops = &cygnus_ssp_dai_ops, \
.suspend = cygnus_ssp_suspend, \
--
2.14.1
^ permalink raw reply related [flat|nested] 8+ messages in thread