kevin/linux
1
Fork 0
Code

ASoC: Intel: sof_da7219: board id cleanup for jsl boards

Browse Source 
Introduce "jsl_da7219_def" board to reduce the number of jsl board
configs. This config could support all boards which implement
headphone codec on SSP0 and speaker amplifiers on SSP1.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://msgid.link/r/20240325221059.206042-16-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Brent Lu 2024-03-25 17:10:53 -05:00 committed by Mark Brown
parent ed61b2ef5a
commit 45728dc6df
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/intel/boards/sof_da7219.c
View File

@ -375,13 +375,7 @@ static int audio_probe(struct platform_device *pdev)
static const struct platform_device_id board_ids[] = { static const struct platform_device_id board_ids[] = {
{ {
.name = "jsl_mx98373_da7219", .name = "jsl_da7219_def",
.driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD |
SOF_SSP_PORT_CODEC(0) |
SOF_SSP_PORT_AMP(1)),
},
{
.name = "jsl_mx98360_da7219",
.driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD | .driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD |
SOF_SSP_PORT_CODEC(0) | SOF_SSP_PORT_CODEC(0) |
SOF_SSP_PORT_AMP(1)), SOF_SSP_PORT_AMP(1)),

4
sound/soc/intel/common/soc-acpi-intel-jsl-match.c
View File

@ -52,14 +52,14 @@ static const struct snd_soc_acpi_codecs rt5682_rt5682s_hp = {
struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
{ {
.id = "DLGS7219", .id = "DLGS7219",
.drv_name = "jsl_mx98373_da7219", .drv_name = "jsl_da7219_def",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &mx98373_spk, .quirk_data = &mx98373_spk,
.sof_tplg_filename = "sof-jsl-da7219.tplg", .sof_tplg_filename = "sof-jsl-da7219.tplg",
}, },
{ {
.id = "DLGS7219", .id = "DLGS7219",
.drv_name = "jsl_mx98360_da7219", .drv_name = "jsl_da7219_def",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &mx98360a_spk, .quirk_data = &mx98360a_spk,
.sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg", .sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",