ASoC: Intel: sof_nau8825: use realtek-common module

Use realtek-common module to support rt1019p speaker amplifier.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20230915124852.1696857-16-yung-chuan.liao@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 1e4e58f22ca6dfbc4245d95442bd92399f17988e..10fdd70b09c95c5fdb7b5b9a2a4d3c9c409605b3 100644 (file)
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -214,10 +214,6 @@ static const struct snd_kcontrol_new sof_controls[] = {
        SOC_DAPM_PIN_SWITCH("Right Spk"),
 };
 
-static const struct snd_kcontrol_new speaker_controls[] = {
-       SOC_DAPM_PIN_SWITCH("Spk"),
-};
-
 static const struct snd_soc_dapm_widget sof_widgets[] = {
        SND_SOC_DAPM_HP("Headphone Jack", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
@@ -225,10 +221,6 @@ static const struct snd_soc_dapm_widget sof_widgets[] = {
        SND_SOC_DAPM_SPK("Right Spk", NULL),
 };
 
-static const struct snd_soc_dapm_widget speaker_widgets[] = {
-       SND_SOC_DAPM_SPK("Spk", NULL),
-};
-
 static const struct snd_soc_dapm_widget dmic_widgets[] = {
        SND_SOC_DAPM_MIC("SoC DMIC", NULL),
 };
@@ -242,44 +234,11 @@ static const struct snd_soc_dapm_route sof_map[] = {
        { "MIC", NULL, "Headset Mic" },
 };
 
-static const struct snd_soc_dapm_route speaker_map[] = {
-       /* speaker */
-       { "Spk", NULL, "Speaker" },
-};
-
 static const struct snd_soc_dapm_route dmic_map[] = {
        /* digital mics */
        {"DMic", NULL, "SoC DMIC"},
 };
 
-static int speaker_codec_init(struct snd_soc_pcm_runtime *rtd)
-{
-       struct snd_soc_card *card = rtd->card;
-       int ret;
-
-       ret = snd_soc_dapm_new_controls(&card->dapm, speaker_widgets,
-                                       ARRAY_SIZE(speaker_widgets));
-       if (ret) {
-               dev_err(rtd->dev, "unable to add dapm controls, ret %d\n", ret);
-               /* Don't need to add routes if widget addition failed */
-               return ret;
-       }
-
-       ret = snd_soc_add_card_controls(card, speaker_controls,
-                                       ARRAY_SIZE(speaker_controls));
-       if (ret) {
-               dev_err(rtd->dev, "unable to add card controls, ret %d\n", ret);
-               return ret;
-       }
-
-       ret = snd_soc_dapm_add_routes(&card->dapm, speaker_map,
-                                     ARRAY_SIZE(speaker_map));
-
-       if (ret)
-               dev_err(rtd->dev, "Speaker map addition failed: %d\n", ret);
-       return ret;
-}
-
 static int dmic_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
@@ -330,13 +289,6 @@ static struct snd_soc_dai_link_component dmic_component[] = {
        }
 };
 
-static struct snd_soc_dai_link_component rt1019p_component[] = {
-       {
-               .name = "RTL1019:00",
-               .dai_name = "HiFi",
-       }
-};
-
 static struct snd_soc_dai_link *
 sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
                          int ssp_codec, int ssp_amp, int dmic_be_num,
@@ -478,9 +430,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
                        sof_rt1015p_dai_link(&links[id]);
                        break;
                case CODEC_RT1019P:
-                       links[id].codecs = rt1019p_component;
-                       links[id].num_codecs = ARRAY_SIZE(rt1019p_component);
-                       links[id].init = speaker_codec_init;
+                       sof_rt1019p_dai_link(&links[id]);
                        break;
                default:
                        dev_err(dev, "invalid amp type %d\n", amp_type);