From: Brent Lu <brent.lu@xxxxxxxxx>
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@xxxxxxxxxxxxxxx>
Signed-off-by: Brent Lu <brent.lu@xxxxxxxxx>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx>
---
sound/soc/intel/boards/sof_nau8825.c | 14 +++-----------
sound/soc/intel/common/soc-acpi-intel-adl-match.c | 2 +-
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
index b9db6e236a93..23fe8b4015cc 100644
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -271,10 +271,10 @@ static int sof_audio_probe(struct platform_device *pdev)
case CODEC_RT1015P:
sof_rt1015p_codec_conf(&sof_audio_card_nau8825);
break;
+ case CODEC_MAX98360A:
+ case CODEC_NAU8318:
+ case CODEC_RT1019P:
case CODEC_NONE:
- case CODEC_MAX98360A:
- case CODEC_NAU8318:
- case CODEC_RT1019P:
/* no codec conf required */
break;
default:
@@ -297,14 +297,6 @@ static int sof_audio_probe(struct platform_device *pdev)
}
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",
.driver_data = (kernel_ulong_t)(SOF_SSP_PORT_CODEC(0) |
diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 6c710e9a26f1..7ce8aade07d7 100644
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -563,7 +563,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
},
{
.id = "10508825",
- .drv_name = "sof_nau8825",
+ .drv_name = "adl_nau8825_def",
.sof_tplg_filename = "sof-adl-nau8825.tplg",
},
{
--
2.40.1
