ASoC: Intel: sof_rt5682: use comp_ids to enumerate rt5682s

Use comp_ids field to enumerate rt5682/rt5682s headphone codec for
JSL/TGL/ADL devices and remove redundant entries in tables.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20211029171409.611600-4-brent.lu@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index c41c584379d958a086c7e44ea74d2fe29bb2f0fc..c41f386b41388bc87f9654042ed5482dc4406c8a 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -1050,36 +1050,6 @@ static const struct platform_device_id board_ids[] = {
                                        SOF_RT5682_SSP_AMP(2) |
                                        SOF_RT5682_NUM_HDMIDEV(4)),
        },
-       {
-               .name = "jsl_rt5682s_rt1015",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_MCLK_24MHZ |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682S_HEADPHONE_CODEC_PRESENT |
-                                       SOF_SPEAKER_AMP_PRESENT |
-                                       SOF_RT1015_SPEAKER_AMP_PRESENT |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
-       {
-               .name = "jsl_rt5682s_rt1015p",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_MCLK_24MHZ |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682S_HEADPHONE_CODEC_PRESENT |
-                                       SOF_SPEAKER_AMP_PRESENT |
-                                       SOF_RT1015P_SPEAKER_AMP_PRESENT |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
-       {
-               .name = "jsl_rt5682s_mx98360",
-               .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |
-                                       SOF_RT5682_MCLK_24MHZ |
-                                       SOF_RT5682_SSP_CODEC(0) |
-                                       SOF_RT5682S_HEADPHONE_CODEC_PRESENT |
-                                       SOF_SPEAKER_AMP_PRESENT |
-                                       SOF_MAX98360A_SPEAKER_AMP_PRESENT |
-                                       SOF_RT5682_SSP_AMP(1)),
-       },
        {
                .name = "adl_mx98360_rt5682",
                .driver_data = (kernel_ulong_t)(SOF_RT5682_MCLK_EN |

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 f5b21a95d2220dc43346a2d28bc611e638b7656d..06f503452aa50d4f33eafc033659b88219b74f29 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -285,9 +285,14 @@ static const struct snd_soc_acpi_codecs adl_max98360a_amp = {
        .codecs = {"MX98360A"}
 };
 
+static const struct snd_soc_acpi_codecs adl_rt5682_rt5682s_hp = {
+       .num_codecs = 2,
+       .codecs = {"10EC5682", "RTL5682"},
+};
+
 struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
        {
-               .id = "10EC5682",
+               .comp_ids = &adl_rt5682_rt5682s_hp,
                .drv_name = "adl_mx98373_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98373_amp,
@@ -295,7 +300,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .sof_tplg_filename = "sof-adl-max98373-rt5682.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &adl_rt5682_rt5682s_hp,
                .drv_name = "adl_mx98357_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98357a_amp,
@@ -303,7 +308,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &adl_rt5682_rt5682s_hp,
                .drv_name = "adl_mx98360_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98360a_amp,

diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index e7d22e3972997bc4bcca51f17cc8aaae340c1e98..ee703701bff2166b9007392051dde388f95b7ba5 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -29,6 +29,11 @@ static struct snd_soc_acpi_codecs mx98360a_spk = {
        .codecs = {"MX98360A"}
 };
 
+static const struct snd_soc_acpi_codecs rt5682_rt5682s_hp = {
+       .num_codecs = 2,
+       .codecs = {"10EC5682", "RTL5682"},
+};
+
 /*
  * When adding new entry to the snd_soc_acpi_intel_jsl_machines array,
  * use .quirk_data member to distinguish different machine driver,
@@ -50,7 +55,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
                .sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &rt5682_rt5682s_hp,
                .drv_name = "jsl_rt5682_rt1015",
                .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
@@ -58,7 +63,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
                .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &rt5682_rt5682s_hp,
                .drv_name = "jsl_rt5682_rt1015p",
                .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
@@ -66,7 +71,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
                .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &rt5682_rt5682s_hp,
                .drv_name = "jsl_rt5682_mx98360",
                .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
@@ -81,30 +86,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
                .quirk_data = &mx98360a_spk,
                .sof_tplg_filename = "sof-jsl-cs42l42-mx98360a.tplg",
        },
-       {
-               .id = "RTL5682",
-               .drv_name = "jsl_rt5682s_rt1015",
-               .sof_fw_filename = "sof-jsl.ri",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &rt1015_spk,
-               .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
-       },
-       {
-               .id = "RTL5682",
-               .drv_name = "jsl_rt5682s_rt1015p",
-               .sof_fw_filename = "sof-jsl.ri",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &rt1015p_spk,
-               .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
-       },
-       {
-               .id = "RTL5682",
-               .drv_name = "jsl_rt5682s_mx98360",
-               .sof_fw_filename = "sof-jsl.ri",
-               .machine_quirk = snd_soc_acpi_codec_list,
-               .quirk_data = &mx98360a_spk,
-               .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg",
-       },
        {
                .id = "ESSX8336",
                .drv_name = "sof-essx8336",

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index 9d89f01d6b84720eccfa2b36ad1916b5199a39bc..da31bb3cca17cf2836b39d5fa5ccc428b72b8413 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -358,9 +358,14 @@ static const struct snd_soc_acpi_codecs tgl_rt1011_amp = {
        .codecs = {"10EC1011"}
 };
 
+static const struct snd_soc_acpi_codecs tgl_rt5682_rt5682s_hp = {
+       .num_codecs = 2,
+       .codecs = {"10EC5682", "RTL5682"},
+};
+
 struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
        {
-               .id = "10EC5682",
+               .comp_ids = &tgl_rt5682_rt5682s_hp,
                .drv_name = "tgl_mx98357_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_codecs,
@@ -368,7 +373,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
                .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &tgl_rt5682_rt5682s_hp,
                .drv_name = "tgl_mx98373_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_max98373_amp,
@@ -376,7 +381,7 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
                .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",
        },
        {
-               .id = "10EC5682",
+               .comp_ids = &tgl_rt5682_rt5682s_hp,
                .drv_name = "tgl_rt1011_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_rt1011_amp,