* [PATCH 1/1] [ASoC] Fix v2: Revert 'ASoC: imx-ssi: Remove mono support'.
@ 2012-09-06 6:25 Gaëtan Carlier
2012-09-06 6:29 ` Gaëtan Carlier
0 siblings, 1 reply; 2+ messages in thread
From: Gaëtan Carlier @ 2012-09-06 6:25 UTC (permalink / raw)
To: linux-arm-kernel
When patch of Javier Martin is applied on linux-next-20120824
the patch failed because comment line is missing.
Signed-off-by: Ga?tan Carlier <gcembed@gmail.com>
Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
---
sound/soc/fsl/imx-ssi.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 7074ae6..3c520c4 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai)
static struct snd_soc_dai_driver imx_ssi_dai = {
.probe = imx_ssi_dai_probe,
.playback = {
- /* The SSI does not support monaural audio. */
- .channels_min = 2,
+ .channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_96000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
},
.capture = {
- .channels_min = 2,
+ .channels_min = 1,
.channels_max = 2,
.rates = SNDRV_PCM_RATE_8000_96000,
.formats = SNDRV_PCM_FMTBIT_S16_LE,
--
1.7.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH 1/1] [ASoC] Fix v2: Revert 'ASoC: imx-ssi: Remove mono support'.
2012-09-06 6:25 [PATCH 1/1] [ASoC] Fix v2: Revert 'ASoC: imx-ssi: Remove mono support' Gaëtan Carlier
@ 2012-09-06 6:29 ` Gaëtan Carlier
0 siblings, 0 replies; 2+ messages in thread
From: Gaëtan Carlier @ 2012-09-06 6:29 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
Sorry I missed the patch send by Fabio earlier.
Ignore this one.
Regards,
Ga?tan Carlier.
On 09/06/2012 08:25 AM, Ga?tan Carlier wrote:
> When patch of Javier Martin is applied on linux-next-20120824
> the patch failed because comment line is missing.
>
> Signed-off-by: Ga?tan Carlier <gcembed@gmail.com>
> Signed-off-by: Javier Martin <javier.martin@vista-silicon.com>
> ---
> sound/soc/fsl/imx-ssi.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
> index 7074ae6..3c520c4 100644
> --- a/sound/soc/fsl/imx-ssi.c
> +++ b/sound/soc/fsl/imx-ssi.c
> @@ -380,14 +380,13 @@ static int imx_ssi_dai_probe(struct snd_soc_dai *dai)
> static struct snd_soc_dai_driver imx_ssi_dai = {
> .probe = imx_ssi_dai_probe,
> .playback = {
> - /* The SSI does not support monaural audio. */
> - .channels_min = 2,
> + .channels_min = 1,
> .channels_max = 2,
> .rates = SNDRV_PCM_RATE_8000_96000,
> .formats = SNDRV_PCM_FMTBIT_S16_LE,
> },
> .capture = {
> - .channels_min = 2,
> + .channels_min = 1,
> .channels_max = 2,
> .rates = SNDRV_PCM_RATE_8000_96000,
> .formats = SNDRV_PCM_FMTBIT_S16_LE,
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-09-06 6:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-06 6:25 [PATCH 1/1] [ASoC] Fix v2: Revert 'ASoC: imx-ssi: Remove mono support' Gaëtan Carlier
2012-09-06 6:29 ` Gaëtan Carlier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).