ASoC: Intel: sof_sdw: use .controls/.widgets to add controls/widgets

sof_sdw_rtd_init() will add the controls and widgets if we set them in
the codec_info. Move the additions from .rtd_init callback to
sof_sdw_rtd_init().

Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240509163418.67746-17-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 3acc2db61b35862212a92b5462fc2feec7de80ac..8c1497bab2efda19639549f063d6fabcc98ed56d 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -515,6 +515,50 @@ static struct snd_soc_dai_link_component platform_component[] = {
        }
 };
 
+static const struct snd_soc_dapm_widget generic_dmic_widgets[] = {
+       SND_SOC_DAPM_MIC("DMIC", NULL),
+};
+
+static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static const struct snd_kcontrol_new generic_jack_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Headphone"),
+       SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
+       SND_SOC_DAPM_SPK("Speaker", NULL),
+};
+
+static const struct snd_kcontrol_new generic_spk_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Speaker"),
+};
+
+static const struct snd_soc_dapm_widget maxim_widgets[] = {
+       SND_SOC_DAPM_SPK("Left Spk", NULL),
+       SND_SOC_DAPM_SPK("Right Spk", NULL),
+};
+
+static const struct snd_kcontrol_new maxim_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Left Spk"),
+       SOC_DAPM_PIN_SWITCH("Right Spk"),
+};
+
+static const struct snd_soc_dapm_widget rt700_widgets[] = {
+       SND_SOC_DAPM_HP("Headphones", NULL),
+       SND_SOC_DAPM_MIC("AMIC", NULL),
+       SND_SOC_DAPM_SPK("Speaker", NULL),
+};
+
+static const struct snd_kcontrol_new rt700_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Headphones"),
+       SOC_DAPM_PIN_SWITCH("AMIC"),
+       SOC_DAPM_PIN_SWITCH("Speaker"),
+};
+
 struct snd_soc_dai *get_codec_dai_by_name(struct snd_soc_pcm_runtime *rtd,
                                          const char * const dai_name[],
                                          int num_dais)
@@ -681,6 +725,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dai_type = SOF_SDW_DAI_TYPE_JACK,
                                .dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
                                .rtd_init = rt700_rtd_init,
+                               .controls = rt700_controls,
+                               .num_controls = ARRAY_SIZE(rt700_controls),
+                               .widgets = rt700_widgets,
+                               .num_widgets = ARRAY_SIZE(rt700_widgets),
                        },
                },
                .dai_num = 1,
@@ -697,6 +745,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_sdca_jack_init,
                                .exit = sof_sdw_rt_sdca_jack_exit,
                                .rtd_init = rt_sdca_jack_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                },
                .dai_num = 1,
@@ -713,6 +765,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt711_init,
                                .exit = sof_sdw_rt711_exit,
                                .rtd_init = rt711_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                },
                .dai_num = 1,
@@ -729,6 +785,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_sdca_jack_init,
                                .exit = sof_sdw_rt_sdca_jack_exit,
                                .rtd_init = rt_sdca_jack_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                        {
                                .direction = {true, false},
@@ -738,6 +798,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_amp_init,
                                .exit = sof_sdw_rt_amp_exit,
                                .rtd_init = rt712_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                        },
                },
                .dai_num = 2,
@@ -768,6 +832,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_sdca_jack_init,
                                .exit = sof_sdw_rt_sdca_jack_exit,
                                .rtd_init = rt_sdca_jack_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                },
                .dai_num = 1,
@@ -798,6 +866,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_amp_init,
                                .exit = sof_sdw_rt_amp_exit,
                                .rtd_init = rt_amp_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                        },
                },
                .dai_num = 1,
@@ -814,6 +886,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_amp_init,
                                .exit = sof_sdw_rt_amp_exit,
                                .rtd_init = rt_amp_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                        },
                },
                .dai_num = 1,
@@ -829,6 +905,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_amp_init,
                                .exit = sof_sdw_rt_amp_exit,
                                .rtd_init = rt_amp_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                        },
                },
                .dai_num = 1,
@@ -905,6 +985,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_sdca_jack_init,
                                .exit = sof_sdw_rt_sdca_jack_exit,
                                .rtd_init = rt_sdca_jack_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                        {
                                .direction = {true, false},
@@ -915,6 +999,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .init = sof_sdw_rt_amp_init,
                                .exit = sof_sdw_rt_amp_exit,
                                .rtd_init = rt722_spk_rtd_init,
+                               .controls = generic_spk_controls,
+                               .num_controls = ARRAY_SIZE(generic_spk_controls),
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                        },
                        {
                                .direction = {false, true},
@@ -936,6 +1024,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},
                                .init = sof_sdw_maxim_init,
                                .rtd_init = maxim_spk_rtd_init,
+                               .controls = maxim_controls,
+                               .num_controls = ARRAY_SIZE(maxim_controls),
+                               .widgets = maxim_widgets,
+                               .num_widgets = ARRAY_SIZE(maxim_widgets),
                        },
                },
                .dai_num = 1,
@@ -950,6 +1042,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
                                .init = sof_sdw_maxim_init,
                                .rtd_init = maxim_spk_rtd_init,
+                               .controls = maxim_controls,
+                               .num_controls = ARRAY_SIZE(maxim_controls),
+                               .widgets = maxim_widgets,
+                               .num_widgets = ARRAY_SIZE(maxim_widgets),
                        },
                },
                .dai_num = 1,
@@ -963,6 +1059,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dai_type = SOF_SDW_DAI_TYPE_JACK,
                                .dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
                                .rtd_init = rt5682_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                },
                .dai_num = 1,
@@ -977,6 +1077,8 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dailink = {SDW_AMP_OUT_DAI_ID, SDW_AMP_IN_DAI_ID},
                                .init = sof_sdw_cs_amp_init,
                                .rtd_init = cs_spk_rtd_init,
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                        },
                },
                .dai_num = 1,
@@ -990,6 +1092,10 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dai_type = SOF_SDW_DAI_TYPE_JACK,
                                .dailink = {SDW_JACK_OUT_DAI_ID, SDW_JACK_IN_DAI_ID},
                                .rtd_init = cs42l42_rtd_init,
+                               .controls = generic_jack_controls,
+                               .num_controls = ARRAY_SIZE(generic_jack_controls),
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                },
                .dai_num = 1,
@@ -1006,6 +1112,8 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dai_type = SOF_SDW_DAI_TYPE_JACK,
                                .dailink = {SDW_JACK_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
                                .rtd_init = cs42l43_hs_rtd_init,
+                               .widgets = generic_jack_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_jack_widgets),
                        },
                        {
                                .direction = {false, true},
@@ -1013,6 +1121,8 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dai_type = SOF_SDW_DAI_TYPE_MIC,
                                .dailink = {SDW_UNUSED_DAI_ID, SDW_DMIC_DAI_ID},
                                .rtd_init = cs42l43_dmic_rtd_init,
+                               .widgets = generic_dmic_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_dmic_widgets),
                        },
                        {
                                .direction = {false, true},
@@ -1027,6 +1137,8 @@ static struct sof_sdw_codec_info codec_info_list[] = {
                                .dailink = {SDW_AMP_OUT_DAI_ID, SDW_UNUSED_DAI_ID},
                                .init = sof_sdw_cs42l43_spk_init,
                                .rtd_init = cs42l43_spk_rtd_init,
+                               .widgets = generic_spk_widgets,
+                               .num_widgets = ARRAY_SIZE(generic_spk_widgets),
                                .quirk = SOF_CODEC_SPKR | SOF_SIDECAR_AMPS,
                        },
                },

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l42.c b/sound/soc/intel/boards/sof_sdw_cs42l42.c
index 82555c53a9c9e4829a8642b97e75d0b99d0fe56a..9783d5fb2d91c02da767b3b5eb151610e1b190c0 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l42.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l42.c
@@ -17,11 +17,6 @@
 #include <sound/jack.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
-       SND_SOC_DAPM_HP("Headphone", NULL),
-       SND_SOC_DAPM_MIC("Headset Mic", NULL),
-};
-
 static const struct snd_soc_dapm_route cs42l42_map[] = {
        /* HP jack connectors - unknown if we have jack detection */
        {"Headphone", NULL, "cs42l42 HP"},
@@ -30,11 +25,6 @@ static const struct snd_soc_dapm_route cs42l42_map[] = {
        {"cs42l42 HS", NULL, "Headset Mic"},
 };
 
-static const struct snd_kcontrol_new generic_jack_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Headphone"),
-       SOC_DAPM_PIN_SWITCH("Headset Mic"),
-};
-
 static struct snd_soc_jack_pin cs42l42_jack_pins[] = {
        {
                .pin    = "Headphone",
@@ -70,20 +60,6 @@ int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_jack_controls,
-                                       ARRAY_SIZE(generic_jack_controls));
-       if (ret) {
-               dev_err(card->dev, "cs42l42 control addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
-                                       ARRAY_SIZE(generic_jack_widgets));
-       if (ret) {
-               dev_err(card->dev, "cs42l42 widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, cs42l42_map,
                                      ARRAY_SIZE(cs42l42_map));
 

diff --git a/sound/soc/intel/boards/sof_sdw_cs42l43.c b/sound/soc/intel/boards/sof_sdw_cs42l43.c
index f76a16795fda608645dd6bcacae6ae771247be40..2dd0f085fe60bd049824a4d76a9b8af58fcdc3c9 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs42l43.c
+++ b/sound/soc/intel/boards/sof_sdw_cs42l43.c
@@ -18,11 +18,6 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
-       SND_SOC_DAPM_HP("Headphone", NULL),
-       SND_SOC_DAPM_MIC("Headset Mic", NULL),
-};
-
 static const struct snd_soc_dapm_route cs42l43_hs_map[] = {
        { "Headphone", NULL, "cs42l43 AMP3_OUT" },
        { "Headphone", NULL, "cs42l43 AMP4_OUT" },
@@ -30,10 +25,6 @@ static const struct snd_soc_dapm_route cs42l43_hs_map[] = {
        { "cs42l43 ADC1_IN1_N", NULL, "Headset Mic" },
 };
 
-static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
 static const struct snd_soc_dapm_route cs42l43_spk_map[] = {
        { "Speaker", NULL, "cs42l43 AMP1_OUT_P", },
        { "Speaker", NULL, "cs42l43 AMP1_OUT_N", },
@@ -41,10 +32,6 @@ static const struct snd_soc_dapm_route cs42l43_spk_map[] = {
        { "Speaker", NULL, "cs42l43 AMP2_OUT_N", },
 };
 
-static const struct snd_soc_dapm_widget generic_dmic_widgets[] = {
-       SND_SOC_DAPM_MIC("DMIC", NULL),
-};
-
 static const struct snd_soc_dapm_route cs42l43_dmic_map[] = {
        { "cs42l43 PDM1_DIN", NULL, "DMIC" },
        { "cs42l43 PDM2_DIN", NULL, "DMIC" },
@@ -74,13 +61,6 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
-                                       ARRAY_SIZE(generic_jack_widgets));
-       if (ret) {
-               dev_err(card->dev, "cs42l43 hs widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_hs_map,
                                      ARRAY_SIZE(cs42l43_hs_map));
        if (ret) {
@@ -133,13 +113,6 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
                        return -ENOMEM;
        }
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
-                                       ARRAY_SIZE(generic_spk_widgets));
-       if (ret) {
-               dev_err(card->dev, "cs42l43 speaker widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_spk_map,
                                      ARRAY_SIZE(cs42l43_spk_map));
        if (ret)
@@ -172,13 +145,6 @@ int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_dmic_widgets,
-                                       ARRAY_SIZE(generic_dmic_widgets));
-       if (ret) {
-               dev_err(card->dev, "cs42l43 dmic widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, cs42l43_dmic_map,
                                      ARRAY_SIZE(cs42l43_dmic_map));
        if (ret)

diff --git a/sound/soc/intel/boards/sof_sdw_cs_amp.c b/sound/soc/intel/boards/sof_sdw_cs_amp.c
index e15a4753f103e42cf501751e60da809df83beb45..663c0e1d2c563f2a06c09776ca5e5df774775bf9 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_cs_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_cs_amp.c
@@ -14,10 +14,6 @@
 
 #define CODEC_NAME_SIZE        8
 
-static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
 int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        const char *dai_name = rtd->dai_link->codecs->dai_name;
@@ -35,13 +31,6 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
-                                       ARRAY_SIZE(generic_spk_widgets));
-       if (ret) {
-               dev_err(card->dev, "widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        for_each_rtd_codec_dais(rtd, i, codec_dai) {
                if (!strstr(codec_dai->name, "cs35l56"))
                        continue;

diff --git a/sound/soc/intel/boards/sof_sdw_maxim.c b/sound/soc/intel/boards/sof_sdw_maxim.c
index 57c1a5fb17a9814ab9f4c49dcb05509a88dfd701..a7a8db624818b56bc6483673782b024631612b09 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_maxim.c
+++ b/sound/soc/intel/boards/sof_sdw_maxim.c
@@ -16,16 +16,6 @@ static int maxim_part_id;
 #define SOF_SDW_PART_ID_MAX98363 0x8363
 #define SOF_SDW_PART_ID_MAX98373 0x8373
 
-static const struct snd_soc_dapm_widget maxim_widgets[] = {
-       SND_SOC_DAPM_SPK("Left Spk", NULL),
-       SND_SOC_DAPM_SPK("Right Spk", NULL),
-};
-
-static const struct snd_kcontrol_new maxim_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Left Spk"),
-       SOC_DAPM_PIN_SWITCH("Right Spk"),
-};
-
 static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {
        { "Left Spk", NULL, "Left BE_OUT" },
        { "Right Spk", NULL, "Right BE_OUT" },
@@ -45,20 +35,6 @@ int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        dev_dbg(card->dev, "soundwire maxim card components assigned : %s\n",
                card->components);
 
-       ret = snd_soc_add_card_controls(card, maxim_controls,
-                                       ARRAY_SIZE(maxim_controls));
-       if (ret) {
-               dev_err(card->dev, "mx%04x ctrls addition failed: %d\n", maxim_part_id, ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, maxim_widgets,
-                                       ARRAY_SIZE(maxim_widgets));
-       if (ret) {
-               dev_err(card->dev, "mx%04x widgets addition failed: %d\n", maxim_part_id, ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, max_98373_dapm_routes, 2);
        if (ret)
                dev_err(rtd->dev, "failed to add first SPK map: %d\n", ret);

diff --git a/sound/soc/intel/boards/sof_sdw_rt5682.c b/sound/soc/intel/boards/sof_sdw_rt5682.c
index 9fbe36322a835a2d680df31f0ed7da91e914a282..1741226fe052f28540d4722838598e87ad71eff7 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt5682.c
+++ b/sound/soc/intel/boards/sof_sdw_rt5682.c
@@ -17,11 +17,6 @@
 #include <sound/jack.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
-       SND_SOC_DAPM_HP("Headphone", NULL),
-       SND_SOC_DAPM_MIC("Headset Mic", NULL),
-};
-
 static const struct snd_soc_dapm_route rt5682_map[] = {
        /*Headphones*/
        { "Headphone", NULL, "rt5682 HPOL" },
@@ -29,11 +24,6 @@ static const struct snd_soc_dapm_route rt5682_map[] = {
        { "rt5682 IN1P", NULL, "Headset Mic" },
 };
 
-static const struct snd_kcontrol_new generic_jack_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Headphone"),
-       SOC_DAPM_PIN_SWITCH("Headset Mic"),
-};
-
 static struct snd_soc_jack_pin rt5682_jack_pins[] = {
        {
                .pin    = "Headphone",
@@ -69,20 +59,6 @@ int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_jack_controls,
-                                       ARRAY_SIZE(generic_jack_controls));
-       if (ret) {
-               dev_err(card->dev, "rt5682 control addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
-                                       ARRAY_SIZE(generic_jack_widgets));
-       if (ret) {
-               dev_err(card->dev, "rt5682 widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt5682_map,
                                      ARRAY_SIZE(rt5682_map));
 

diff --git a/sound/soc/intel/boards/sof_sdw_rt700.c b/sound/soc/intel/boards/sof_sdw_rt700.c
index a2648c900e747a631c2e96e4e16f14e07ef6a06d..58677a8968abe5093967444bdcc0426f19c67d2a 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt700.c
+++ b/sound/soc/intel/boards/sof_sdw_rt700.c
@@ -15,12 +15,6 @@
 #include <sound/jack.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget rt700_widgets[] = {
-       SND_SOC_DAPM_HP("Headphones", NULL),
-       SND_SOC_DAPM_MIC("AMIC", NULL),
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
 static const struct snd_soc_dapm_route rt700_map[] = {
        /* Headphones */
        { "Headphones", NULL, "rt700 HP" },
@@ -28,12 +22,6 @@ static const struct snd_soc_dapm_route rt700_map[] = {
        { "rt700 MIC2", NULL, "AMIC" },
 };
 
-static const struct snd_kcontrol_new rt700_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Headphones"),
-       SOC_DAPM_PIN_SWITCH("AMIC"),
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-};
-
 static struct snd_soc_jack_pin rt700_jack_pins[] = {
        {
                .pin    = "Headphones",
@@ -69,20 +57,6 @@ int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, rt700_controls,
-                                       ARRAY_SIZE(rt700_controls));
-       if (ret) {
-               dev_err(card->dev, "rt700 controls addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, rt700_widgets,
-                                       ARRAY_SIZE(rt700_widgets));
-       if (ret) {
-               dev_err(card->dev, "rt700 widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt700_map,
                                      ARRAY_SIZE(rt700_map));
 

diff --git a/sound/soc/intel/boards/sof_sdw_rt711.c b/sound/soc/intel/boards/sof_sdw_rt711.c
index 1a0f6692034ab5492fbaf8da08bb4b3f6702d179..4cff48a37e3c1e1009f2f5ed21c7e59bf25e49ab 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt711.c
+++ b/sound/soc/intel/boards/sof_sdw_rt711.c
@@ -42,22 +42,12 @@ static int rt711_add_codec_device_props(struct device *sdw_dev)
        return ret;
 }
 
-static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
-       SND_SOC_DAPM_HP("Headphone", NULL),
-       SND_SOC_DAPM_MIC("Headset Mic", NULL),
-};
-
 static const struct snd_soc_dapm_route rt711_map[] = {
        /* Headphones */
        { "Headphone", NULL, "rt711 HP" },
        { "rt711 MIC2", NULL, "Headset Mic" },
 };
 
-static const struct snd_kcontrol_new generic_jack_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Headphone"),
-       SOC_DAPM_PIN_SWITCH("Headset Mic"),
-};
-
 static struct snd_soc_jack_pin rt711_jack_pins[] = {
        {
                .pin    = "Headphone",
@@ -93,20 +83,6 @@ int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_jack_controls,
-                                       ARRAY_SIZE(generic_jack_controls));
-       if (ret) {
-               dev_err(card->dev, "rt711 controls addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
-                                       ARRAY_SIZE(generic_jack_widgets));
-       if (ret) {
-               dev_err(card->dev, "rt711 widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt711_map,
                                      ARRAY_SIZE(rt711_map));
 

diff --git a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
index 42308228c634bb4dc30af0a1ddaacfe404b6d13d..ee2c57a50f0d4dd5b43f6add97dfe9fdc0b43bdf 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt712_sdca.c
@@ -15,10 +15,6 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
 /*
  * dapm routes for rt712 spk will be registered dynamically according
  * to the number of rt712 spk used. The first two entries will be registered
@@ -30,10 +26,6 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
        { "Speaker", NULL, "rt712 SPOR" },
 };
 
-static const struct snd_kcontrol_new generic_spk_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-};
-
 int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
@@ -45,20 +37,6 @@ int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_spk_controls,
-                                       ARRAY_SIZE(generic_spk_controls));
-       if (ret) {
-               dev_err(card->dev, "rt712 spk controls addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
-                                       ARRAY_SIZE(generic_spk_widgets));
-       if (ret) {
-               dev_err(card->dev, "rt712 spk widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt712_spk_map, ARRAY_SIZE(rt712_spk_map));
        if (ret)
                dev_err(rtd->dev, "failed to add SPK map: %d\n", ret);

diff --git a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
index 1653e45a0f7d60ef9e3cd12f48678ded37e7a19b..02ee8e33a99ae6a5efc6750a6ca5ee6026f2604c 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
+++ b/sound/soc/intel/boards/sof_sdw_rt722_sdca.c
@@ -15,18 +15,10 @@
 #include <sound/soc-dapm.h>
 #include "sof_sdw_common.h"
 
-static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
 static const struct snd_soc_dapm_route rt722_spk_map[] = {
        { "Speaker", NULL, "rt722 SPK" },
 };
 
-static const struct snd_kcontrol_new generic_spk_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-};
-
 int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
@@ -38,20 +30,6 @@ int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_spk_controls,
-                                       ARRAY_SIZE(generic_spk_controls));
-       if (ret) {
-               dev_err(card->dev, "failed to add rt722 spk controls: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
-                                       ARRAY_SIZE(generic_spk_widgets));
-       if (ret) {
-               dev_err(card->dev, "failed to add rt722 spk widgets: %d\n", ret);
-               return ret;
-       }
-
        ret = snd_soc_dapm_add_routes(&card->dapm, rt722_spk_map, ARRAY_SIZE(rt722_spk_map));
        if (ret)
                dev_err(rtd->dev, "failed to add rt722 spk map: %d\n", ret);

diff --git a/sound/soc/intel/boards/sof_sdw_rt_amp.c b/sound/soc/intel/boards/sof_sdw_rt_amp.c
index 03e0978e6a88ef7781277a3bcf7e7935feae33ee..218f6c4efe3832113c87a7368c54ad88e7f6c2c3 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_amp.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_amp.c
@@ -131,14 +131,6 @@ static int rt_amp_add_device_props(struct device *sdw_dev)
        return ret;
 }
 
-static const struct snd_soc_dapm_widget generic_spk_widgets[] = {
-       SND_SOC_DAPM_SPK("Speaker", NULL),
-};
-
-static const struct snd_kcontrol_new generic_spk_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Speaker"),
-};
-
 /*
  * dapm routes for rt1308/rt1316/rt1318 will be registered dynamically
  * according to the number of rt1308/rt1316/rt1318 used. The first two
@@ -202,20 +194,6 @@ int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd)
        if (!card->components)
                return -ENOMEM;
 
-       ret = snd_soc_add_card_controls(card, generic_spk_controls,
-                                       ARRAY_SIZE(generic_spk_controls));
-       if (ret) {
-               dev_err(card->dev, "%s controls addition failed: %d\n", codec_name, ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_spk_widgets,
-                                       ARRAY_SIZE(generic_spk_widgets));
-       if (ret) {
-               dev_err(card->dev, "%s widgets addition failed: %d\n", codec_name, ret);
-               return ret;
-       }
-
        for_each_rtd_codec_dais(rtd, i, dai) {
                if (strstr(dai->component->name_prefix, "-1"))
                        ret = snd_soc_dapm_add_routes(&card->dapm, rt_amp_map, 2);

diff --git a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
index 932fba8ccf9a00967a5b63cd65c1f2c79d0dc04e..c24a5707fb6c3be3356846718b9296aefd0ae543 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
+++ b/sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
@@ -43,11 +43,6 @@ static int rt_sdca_jack_add_codec_device_props(struct device *sdw_dev)
        return ret;
 }
 
-static const struct snd_soc_dapm_widget generic_jack_widgets[] = {
-       SND_SOC_DAPM_HP("Headphone", NULL),
-       SND_SOC_DAPM_MIC("Headset Mic", NULL),
-};
-
 static const struct snd_soc_dapm_route rt711_sdca_map[] = {
        { "Headphone", NULL, "rt711 HP" },
        { "rt711 MIC2", NULL, "Headset Mic" },
@@ -68,11 +63,6 @@ static const struct snd_soc_dapm_route rt722_sdca_map[] = {
        { "rt722 MIC2", NULL, "Headset Mic" },
 };
 
-static const struct snd_kcontrol_new generic_jack_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Headphone"),
-       SOC_DAPM_PIN_SWITCH("Headset Mic"),
-};
-
 static struct snd_soc_jack_pin rt_sdca_jack_pins[] = {
        {
                .pin    = "Headphone",
@@ -129,20 +119,6 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd)
                }
        }
 
-       ret = snd_soc_add_card_controls(card, generic_jack_controls,
-                                       ARRAY_SIZE(generic_jack_controls));
-       if (ret) {
-               dev_err(card->dev, "rt sdca jack controls addition failed: %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, generic_jack_widgets,
-                                       ARRAY_SIZE(generic_jack_widgets));
-       if (ret) {
-               dev_err(card->dev, "rt sdca jack widgets addition failed: %d\n", ret);
-               return ret;
-       }
-
        if (strstr(component->name_prefix, "rt711")) {
                ret = snd_soc_dapm_add_routes(&card->dapm, rt711_sdca_map,
                                              ARRAY_SIZE(rt711_sdca_map));