Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Brent Lu and committed by
Mark Brown
45728dc6 ed61b2ef

+3 -9
+1 -7
sound/soc/intel/boards/sof_da7219.c
··· 375 375 376 376 static const struct platform_device_id board_ids[] = { 377 377 { 378 - .name = "jsl_mx98373_da7219", 379 - .driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD | 380 - SOF_SSP_PORT_CODEC(0) | 381 - SOF_SSP_PORT_AMP(1)), 382 - }, 383 - { 384 - .name = "jsl_mx98360_da7219", 378 + .name = "jsl_da7219_def", 385 379 .driver_data = (kernel_ulong_t)(SOF_DA7219_JSL_BOARD | 386 380 SOF_SSP_PORT_CODEC(0) | 387 381 SOF_SSP_PORT_AMP(1)),
+2 -2
sound/soc/intel/common/soc-acpi-intel-jsl-match.c
··· 52 52 struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = { 53 53 { 54 54 .id = "DLGS7219", 55 - .drv_name = "jsl_mx98373_da7219", 55 + .drv_name = "jsl_da7219_def", 56 56 .machine_quirk = snd_soc_acpi_codec_list, 57 57 .quirk_data = &mx98373_spk, 58 58 .sof_tplg_filename = "sof-jsl-da7219.tplg", 59 59 }, 60 60 { 61 61 .id = "DLGS7219", 62 - .drv_name = "jsl_mx98360_da7219", 62 + .drv_name = "jsl_da7219_def", 63 63 .machine_quirk = snd_soc_acpi_codec_list, 64 64 .quirk_data = &mx98360a_spk, 65 65 .sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",