ASoC: Intel: sof_nau8825: remove sof_nau8825 board id

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>

diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
index b9db6e236a931d8400910c9ff7a07e60a3ca6f65..23fe8b4015cce42a175a7652da07c80cfdd931d9 100644 (file)
--- 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_NONE:
        case CODEC_MAX98360A:
        case CODEC_NAU8318:
        case CODEC_RT1019P:
+       case CODEC_NONE:
                /* 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 6c710e9a26f193852e248435ea90b2aa1516c588..7ce8aade07d70e9ce3bd87805ca942ff609f98f8 100644 (file)
--- 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",
        },
        {