iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: fsi: SPDIF format become independent from platform flags

Browse Source 
Current FSI driver is using platform information pointer,
but it is not good design for DT support.
This patch makes spdif format
independent from platform information pointer.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Kuninori Morimoto 2012-11-16 01:17:06 -08:00 committed by Mark Brown
parent 943fdadc17
commit c2052def9e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sound/soc/sh/fsi.c
View File

@ -1771,7 +1771,6 @@ static int fsi_set_fmt_spdif(struct fsi_priv *fsi)
fsi->fmt = CR_DTMD_SPDIF_PCM | CR_PCM; fsi->fmt = CR_DTMD_SPDIF_PCM | CR_PCM;
fsi->chan_num = 2; fsi->chan_num = 2;
fsi->spdif = 1;
return 0; return 0;
} }
@ -1816,16 +1815,10 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
/* set format */ /* set format */
switch (flags & SH_FSI_FMT_MASK) { if (fsi_is_spdif(fsi))
case SH_FSI_FMT_DAI:
ret = fsi_set_fmt_dai(fsi, fmt & SND_SOC_DAIFMT_FORMAT_MASK);
break;
case SH_FSI_FMT_SPDIF:
ret = fsi_set_fmt_spdif(fsi); ret = fsi_set_fmt_spdif(fsi);
break; else
default: ret = fsi_set_fmt_dai(fsi, fmt & SND_SOC_DAIFMT_FORMAT_MASK);
ret = -EINVAL;
}
return ret; return ret;
} }
@ -1991,6 +1984,13 @@ static struct snd_soc_platform_driver fsi_soc_platform = {
/* /*
* platform function * platform function
*/ */
static void fsi_port_info_init(struct fsi_priv *fsi,
struct sh_fsi_port_info *info)
{
if (info->flags & SH_FSI_FMT_SPDIF)
fsi->spdif = 1;
}
static void fsi_handler_init(struct fsi_priv *fsi, static void fsi_handler_init(struct fsi_priv *fsi,
struct sh_fsi_port_info *info) struct sh_fsi_port_info *info)
{ {
@ -2057,6 +2057,7 @@ static int fsi_probe(struct platform_device *pdev)
fsi->base = master->base; fsi->base = master->base;
fsi->master = master; fsi->master = master;
fsi->info = pinfo; fsi->info = pinfo;
fsi_port_info_init(fsi, pinfo);
fsi_handler_init(fsi, pinfo); fsi_handler_init(fsi, pinfo);
ret = fsi_stream_probe(fsi, &pdev->dev); ret = fsi_stream_probe(fsi, &pdev->dev);
if (ret < 0) { if (ret < 0) {
@ -2070,6 +2071,7 @@ static int fsi_probe(struct platform_device *pdev)
fsi->base = master->base + 0x40; fsi->base = master->base + 0x40;
fsi->master = master; fsi->master = master;
fsi->info = pinfo; fsi->info = pinfo;
fsi_port_info_init(fsi, pinfo);
fsi_handler_init(fsi, pinfo); fsi_handler_init(fsi, pinfo);
ret = fsi_stream_probe(fsi, &pdev->dev); ret = fsi_stream_probe(fsi, &pdev->dev);
if (ret < 0) { if (ret < 0) {