kevin/linux
1
Fork 0
Code

ASoC: Intel: sof_nau8825: remove sof_nau8825 board id

Browse Source 
Remove sof_nau8825 board id and use adl_nau8825_def instead since SSP
port assignment is the same.

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-21-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:58 -05:00 committed by Mark Brown
parent 16e5700644
commit 2b384bcd2c
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sound/soc/intel/boards/sof_nau8825.c
View File

@ -271,10 +271,10 @@ static int sof_audio_probe(struct platform_device *pdev)
case CODEC_RT1015P: case CODEC_RT1015P:
sof_rt1015p_codec_conf(&sof_audio_card_nau8825); sof_rt1015p_codec_conf(&sof_audio_card_nau8825);
break; break;
case CODEC_NONE:
case CODEC_MAX98360A: case CODEC_MAX98360A:
case CODEC_NAU8318: case CODEC_NAU8318:
case CODEC_RT1019P: case CODEC_RT1019P:
case CODEC_NONE:
/* no codec conf required */ /* no codec conf required */
break; break;
default: default:
@ -297,14 +297,6 @@ static int sof_audio_probe(struct platform_device *pdev)
} }
static const struct platform_device_id board_ids[] = { static const struct platform_device_id board_ids[] = {
{
.name = "sof_nau8825",
.driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) |
SOF_NUM_IDISP_HDMI(4) |
SOF_SSP_PORT_BT_OFFLOAD(2) |
SOF_BT_OFFLOAD_PRESENT),
},
{ {
.name = "adl_rt1019p_8825", .name = "adl_rt1019p_8825",
.driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) | .driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) |

2
sound/soc/intel/common/soc-acpi-intel-adl-match.c
View File

@ -563,7 +563,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
}, },
{ {
.id = "10508825", .id = "10508825",
.drv_name = "sof_nau8825", .drv_name = "adl_nau8825_def",
.sof_tplg_filename = "sof-adl-nau8825.tplg", .sof_tplg_filename = "sof-adl-nau8825.tplg",
}, },
{ {