Unverified Commit f1a5cb6a authored by Brent Lu's avatar Brent Lu Committed by Mark Brown
Browse files

ASoC: Intel: sof_rt5682: board id cleanup for mtl boards 



Since mtl chromebook is using DMI quirk for board config, changing the
SSP port config of mtl_rt5682_def to RVP to simplify mtl board id and
enumeration table.

Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240509163418.67746-4-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 426c43ae

sound/soc/intel/boards/sof_rt5682.c

+1 −15
Original line number Diff line number Diff line
@@ -866,27 +866,13 @@ static const struct platform_device_id board_ids[] = { 
					SOF_SSP_MASK_HDMI_CAPTURE(0x5)),

	},

	{

		.name = "mtl_mx98357_rt5682",

		.name = "mtl_rt5682_def",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_SSP_PORT_CODEC(0) |

					SOF_SSP_PORT_AMP(1) |

					SOF_SSP_PORT_BT_OFFLOAD(2) |

					SOF_BT_OFFLOAD_PRESENT),

	},

	{

		.name = "mtl_mx98360_rt5682",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_SSP_PORT_CODEC(0) |

					SOF_SSP_PORT_AMP(1)),

	},

	{

		.name = "mtl_rt5682_def",

		.driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

					SOF_SSP_PORT_CODEC(2) |

					SOF_SSP_PORT_AMP(0) |

					SOF_SSP_PORT_BT_OFFLOAD(1) |

					SOF_BT_OFFLOAD_PRESENT),

	},

	{ }

};

MODULE_DEVICE_TABLE(platform, board_ids);

sound/soc/intel/common/soc-acpi-intel-mtl-match.c

+0 −24
Original line number Diff line number Diff line
@@ -11,16 +11,6 @@ 
#include <sound/soc-acpi-intel-ssp-common.h>

#include "soc-acpi-intel-sdw-mockup-match.h"



static const struct snd_soc_acpi_codecs mtl_max98357a_amp = {

	.num_codecs = 1,

	.codecs = {"MX98357A"}

};



static const struct snd_soc_acpi_codecs mtl_max98360a_amp = {

	.num_codecs = 1,

	.codecs = {"MX98360A"}

};



static const struct snd_soc_acpi_codecs mtl_rt5682_rt5682s_hp = {

	.num_codecs = 2,

	.codecs = {RT5682_ACPI_HID, RT5682S_ACPI_HID},
@@ -37,20 +27,6 @@ static const struct snd_soc_acpi_codecs mtl_lt6911_hdmi = { 
};



struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[] = {

	{

		.comp_ids = &mtl_rt5682_rt5682s_hp,

		.drv_name = "mtl_mx98357_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &mtl_max98357a_amp,

		.sof_tplg_filename = "sof-mtl-max98357a-rt5682.tplg",

	},

	{

		.comp_ids = &mtl_rt5682_rt5682s_hp,

		.drv_name = "mtl_mx98360_rt5682",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &mtl_max98360a_amp,

		.sof_tplg_filename = "sof-mtl-max98360a-rt5682.tplg",

	},

	{

		.comp_ids = &mtl_essx_83x6,

		.drv_name = "mtl_es83x6_c1_h02",