Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49fee178 authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: Intel: Only export one Baytrail DAI 



We don't need more than one DAI for Baytrail SST. Usage becomes also more
straightforward by grouping playback and capture streams under the same PCM
device.

[Jarkko: I made Liam's sst-baytrail-pcm.c change a few lines smaller and
squashed together with my byt-rt5640.c change]

Signed-off-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 3a46c7b7

sound/soc/intel/byt-rt5640.c

+1 −13
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
	{

		.name = "Baytrail Audio",

		.stream_name = "Audio",

		.cpu_dai_name = "Front-cpu-dai",

		.cpu_dai_name = "baytrail-pcm-audio",

		.codec_dai_name = "rt5640-aif1",

		.codec_name = "i2c-10EC5640:00",

		.platform_name = "baytrail-pcm-audio",
@@ -126,18 +126,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.init = byt_rt5640_init,

		.ops = &byt_rt5640_ops,

	},

	{

		.name = "Baytrail Voice",

		.stream_name = "Voice",

		.cpu_dai_name = "Mic1-cpu-dai",

		.codec_dai_name = "rt5640-aif1",

		.codec_name = "i2c-10EC5640:00",

		.platform_name = "baytrail-pcm-audio",

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			   SND_SOC_DAIFMT_CBS_CFS,

		.init = NULL,

		.ops = &byt_rt5640_ops,

	},

};



static struct snd_soc_card byt_rt5640_card = {

sound/soc/intel/sst-baytrail-pcm.c

+2 −5
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd) 


static struct snd_soc_dai_driver byt_dais[] = {

	{

		.name  = "Front-cpu-dai",

		.name  = "Baytrail PCM",

		.playback = {

			.stream_name = "System Playback",

			.channels_min = 2,
@@ -351,9 +351,6 @@ static struct snd_soc_dai_driver byt_dais[] = { 
			.formats = SNDRV_PCM_FMTBIT_S24_3LE |

				   SNDRV_PCM_FMTBIT_S16_LE,

		},

	},

	{

		.name  = "Mic1-cpu-dai",

		.capture = {

			.stream_name = "Analog Capture",

			.channels_min = 2,
@@ -378,7 +375,7 @@ static int sst_byt_pcm_probe(struct snd_soc_platform *platform) 
	priv_data->byt = plat_data->dsp;

	snd_soc_platform_set_drvdata(platform, priv_data);



	for (i = 0; i < ARRAY_SIZE(byt_dais); i++) {

	for (i = 0; i < BYT_PCM_COUNT; i++) {

		mutex_init(&priv_data->pcm[i].mutex);

		INIT_WORK(&priv_data->pcm[i].work, sst_byt_pcm_work);

	}