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

Commit 2193eb96 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: boards: remove hard-coded compressed dailinks 

The hard-coded compressed dailinks are not supported using
publicly-available firmwares, which creates unnecessary user
confusion [1]. Even if the firmware was available, the mainline
code does not have the required .dynamic=1 and .dpcm_playback=1
fields so probably never worked as is, and last and they conflict
with topology-defined streams.

Remove them and move on. This can be re-enabled with SOF later
in a more flexible manner.

[1] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-August/124868.html



Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 149f7757

sound/soc/intel/boards/bytcht_da7213.c

+0 −9
Original line number Diff line number Diff line
@@ -185,14 +185,6 @@ static struct snd_soc_dai_link dailink[] = { 
		.dpcm_playback = 1,

		.ops = &aif1_ops,

	},

	[MERR_DPCM_COMPR] = {

		.name = "Compressed Port",

		.stream_name = "Compress",

		.cpu_dai_name = "compress-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

	},

	/* CODEC<->CODEC link */

	/* back ends */

	{
@@ -243,7 +235,6 @@ static int bytcht_da7213_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	/* fix index of codec dai */

	dai_index = MERR_DPCM_COMPR + 1;

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

		if (!strcmp(dailink[i].codec_name, "i2c-DLGS7213:00")) {

			dai_index = i;

sound/soc/intel/boards/bytcht_es8316.c

+0 −9
Original line number Diff line number Diff line
@@ -194,15 +194,6 @@ static struct snd_soc_dai_link byt_cht_es8316_dais[] = { 
		.ops = &byt_cht_es8316_aif1_ops,

	},



	[MERR_DPCM_COMPR] = {

		.name = "Compressed Port",

		.stream_name = "Compress",

		.cpu_dai_name = "compress-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

	},



		/* back ends */

	{

		/* Only SSP2 has been tested here, so BYT-CR platforms that

sound/soc/intel/boards/bytcht_nocodec.c

+0 −8
Original line number Diff line number Diff line
@@ -133,14 +133,6 @@ static struct snd_soc_dai_link dais[] = { 
		.dpcm_playback = 1,

		.ops = &aif1_ops,

	},

	[MERR_DPCM_COMPR] = {

		.name = "Compressed Port",

		.stream_name = "Compress",

		.cpu_dai_name = "compress-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

	},

	/* CODEC<->CODEC link */

	/* back ends */

	{

sound/soc/intel/boards/bytcr_rt5640.c

+1 −10
Original line number Diff line number Diff line
@@ -678,14 +678,6 @@ static struct snd_soc_dai_link byt_rt5640_dais[] = { 
		.dynamic = 1,

		.dpcm_playback = 1,

		.ops = &byt_rt5640_aif1_ops,

	},

	[MERR_DPCM_COMPR] = {

		.name = "Baytrail Compressed Port",

		.stream_name = "Baytrail Compress",

		.cpu_dai_name = "compress-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

	},

		/* back ends */

	{
@@ -748,7 +740,7 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	struct sst_acpi_mach *mach;

	const char *i2c_name = NULL;

	int ret_val = 0;

	int dai_index;

	int dai_index = 0;

	int i;



	is_bytcr = false;
@@ -762,7 +754,6 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) 
	snd_soc_card_set_drvdata(&byt_rt5640_card, priv);



	/* fix index of codec dai */

	dai_index = MERR_DPCM_COMPR + 1;

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

		if (!strcmp(byt_rt5640_dais[i].codec_name, "i2c-10EC5640:00")) {

			dai_index = i;

sound/soc/intel/boards/bytcr_rt5651.c

+1 −10
Original line number Diff line number Diff line
@@ -389,14 +389,6 @@ static struct snd_soc_dai_link byt_rt5651_dais[] = { 
		.dpcm_playback = 1,

		.ops = &byt_rt5651_aif1_ops,

	},

	[MERR_DPCM_COMPR] = {

		.name = "Compressed Port",

		.stream_name = "Compress",

		.cpu_dai_name = "compress-cpu-dai",

		.codec_dai_name = "snd-soc-dummy-dai",

		.codec_name = "snd-soc-dummy",

		.platform_name = "sst-mfld-platform",

	},

	/* CODEC<->CODEC link */

	/* back ends */

	{
@@ -440,7 +432,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	struct sst_acpi_mach *mach;

	const char *i2c_name = NULL;

	int ret_val = 0;

	int dai_index;

	int dai_index = 0;

	int i;



	priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_ATOMIC);
@@ -454,7 +446,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) 
	snd_soc_card_set_drvdata(&byt_rt5651_card, priv);



	/* fix index of codec dai */

	dai_index = MERR_DPCM_COMPR + 1;

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

		if (!strcmp(byt_rt5651_dais[i].codec_name, "i2c-10EC5651:00")) {

			dai_index = i;