]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: mediatek: mt8188-mt6359: add rt5682s support
authorxiazhengqiao <xiazhengqiao@huaqin.corp-partner.google.com>
Tue, 10 Oct 2023 02:37:38 +0000 (10:37 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 10 Oct 2023 11:39:35 +0000 (12:39 +0100)
To use RT5682S as the codec and MAX98390 as the amp, add a new
sound card named mt8188_rt5682s.

Signed-off-by: xiazhengqiao <xiazhengqiao@huaqin.corp-partner.google.com>
Reviewed-by: Trevor Wu <trevor.wu@mediatek.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20231010023738.8241-3-xiazhengqiao@huaqin.corp-partner.google.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/mediatek/Kconfig
sound/soc/mediatek/mt8188/mt8188-mt6359.c

index 8d1bc88144866fd08a51fbf93b84eecf471d4b2f..43c8fea004399053d7ce0257dd31c63b9e261e52 100644 (file)
@@ -250,6 +250,7 @@ config SND_SOC_MT8188_MT6359
        select SND_SOC_MAX98390
        select SND_SOC_NAU8315
        select SND_SOC_NAU8825
+       select SND_SOC_RT5682S
        help
          This adds support for ASoC machine driver for MediaTek MT8188
          boards with the MT6359 and other I2S audio codecs.
index ed487c14f268253992829e5fc638ca50d1803798..33d477cc2e54fc504b63c865322bffb7272ef0ee 100644 (file)
@@ -17,6 +17,7 @@
 #include "mt8188-afe-common.h"
 #include "../../codecs/nau8825.h"
 #include "../../codecs/mt6359.h"
+#include "../../codecs/rt5682.h"
 #include "../common/mtk-afe-platform-driver.h"
 #include "../common/mtk-soundcard-driver.h"
 #include "../common/mtk-dsp-sof-common.h"
@@ -32,7 +33,7 @@
  #define TEST_MISO_DONE_2      BIT(29)
 
 #define NAU8825_HS_PRESENT     BIT(0)
-
+#define RT5682S_HS_PRESENT     BIT(1)
 /*
  * Maxim MAX98390
  */
@@ -52,6 +53,8 @@
 #define SOF_DMA_UL4 "SOF_DMA_UL4"
 #define SOF_DMA_UL5 "SOF_DMA_UL5"
 
+#define RT5682S_CODEC_DAI     "rt5682s-aif1"
+
 /* FE */
 SND_SOC_DAILINK_DEFS(playback2,
                     DAILINK_COMP_ARRAY(COMP_CPU("DL2")),
@@ -772,6 +775,55 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
        return 0;
 };
 
+static int mt8188_rt5682s_codec_init(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_card *card = rtd->card;
+       struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card);
+       struct mt8188_mt6359_priv *priv = soc_card_data->mach_priv;
+       struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
+       struct snd_soc_jack *jack = &priv->headset_jack;
+       int ret;
+
+       ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_nau8825_widgets,
+                                       ARRAY_SIZE(mt8188_nau8825_widgets));
+       if (ret) {
+               dev_err(rtd->dev, "unable to add rt5682s card widget, ret %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_add_card_controls(card, mt8188_nau8825_controls,
+                                       ARRAY_SIZE(mt8188_nau8825_controls));
+       if (ret) {
+               dev_err(rtd->dev, "unable to add rt5682s card controls, ret %d\n", ret);
+               return ret;
+       }
+
+       ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",
+                                        SND_JACK_HEADSET | SND_JACK_BTN_0 |
+                                        SND_JACK_BTN_1 | SND_JACK_BTN_2 |
+                                        SND_JACK_BTN_3,
+                                        jack,
+                                        nau8825_jack_pins,
+                                        ARRAY_SIZE(nau8825_jack_pins));
+       if (ret) {
+               dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);
+               return ret;
+       }
+
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
+       snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
+       ret = snd_soc_component_set_jack(component, jack, NULL);
+
+       if (ret) {
+               dev_err(rtd->dev, "Headset Jack call-back failed: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+};
+
 static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
@@ -779,6 +831,13 @@ static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd)
        snd_soc_component_set_jack(component, NULL, NULL);
 }
 
+static void mt8188_rt5682s_codec_exit(struct snd_soc_pcm_runtime *rtd)
+{
+       struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
+
+       snd_soc_component_set_jack(component, NULL, NULL);
+}
+
 static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream,
                                    struct snd_pcm_hw_params *params)
 {
@@ -813,6 +872,51 @@ static const struct snd_soc_ops mt8188_nau8825_ops = {
        .hw_params = mt8188_nau8825_hw_params,
 };
 
+static int mt8188_rt5682s_i2s_hw_params(struct snd_pcm_substream *substream,
+                                       struct snd_pcm_hw_params *params)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
+       struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0);
+       unsigned int rate = params_rate(params);
+       int bitwidth;
+       int ret;
+
+       bitwidth = snd_pcm_format_width(params_format(params));
+       if (bitwidth < 0) {
+               dev_err(card->dev, "invalid bit width: %d\n", bitwidth);
+               return bitwidth;
+       }
+
+       ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x00, 0x0, 0x2, bitwidth);
+       if (ret) {
+               dev_err(card->dev, "failed to set tdm slot\n");
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, RT5682_PLL1_S_BCLK1,
+                                 rate * 32, rate * 512);
+       if (ret) {
+               dev_err(card->dev, "failed to set pll\n");
+               return ret;
+       }
+
+       ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL1,
+                                    rate * 512, SND_SOC_CLOCK_IN);
+       if (ret) {
+               dev_err(card->dev, "failed to set sysclk\n");
+               return ret;
+       }
+
+       return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 128,
+                                     SND_SOC_CLOCK_OUT);
+}
+
+static const struct snd_soc_ops mt8188_rt5682s_i2s_ops = {
+       .hw_params = mt8188_rt5682s_i2s_hw_params,
+};
+
 static int mt8188_sof_be_hw_params(struct snd_pcm_substream *substream,
                                   struct snd_pcm_hw_params *params)
 {
@@ -1148,7 +1252,7 @@ static void mt8188_fixup_controls(struct snd_soc_card *card)
        struct mt8188_card_data *card_data = (struct mt8188_card_data *)priv->private_data;
        struct snd_kcontrol *kctl;
 
-       if (card_data->quirk & NAU8825_HS_PRESENT) {
+       if (card_data->quirk & (NAU8825_HS_PRESENT | RT5682S_HS_PRESENT)) {
                struct snd_soc_dapm_widget *w, *next_w;
 
                for_each_card_widgets_safe(card, w, next_w) {
@@ -1190,6 +1294,7 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev)
        struct snd_soc_dai_link *dai_link;
        bool init_mt6359 = false;
        bool init_nau8825 = false;
+       bool init_rt5682s = false;
        bool init_max98390 = false;
        bool init_dumb = false;
        int ret, i;
@@ -1306,6 +1411,13 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev)
                                        dai_link->exit = mt8188_nau8825_codec_exit;
                                        init_nau8825 = true;
                                }
+                       } else if (!strcmp(dai_link->codecs->dai_name, RT5682S_CODEC_DAI)) {
+                               dai_link->ops = &mt8188_rt5682s_i2s_ops;
+                               if (!init_rt5682s) {
+                                       dai_link->init = mt8188_rt5682s_codec_init;
+                                       dai_link->exit = mt8188_rt5682s_codec_exit;
+                                       init_rt5682s = true;
+                               }
                        } else {
                                if (strcmp(dai_link->codecs->dai_name, "snd-soc-dummy-dai")) {
                                        if (!init_dumb) {
@@ -1343,9 +1455,15 @@ static struct mt8188_card_data mt8188_nau8825_card = {
        .quirk = NAU8825_HS_PRESENT,
 };
 
+static struct mt8188_card_data mt8188_rt5682s_card = {
+       .name = "mt8188_rt5682s",
+       .quirk = RT5682S_HS_PRESENT,
+};
+
 static const struct of_device_id mt8188_mt6359_dt_match[] = {
        { .compatible = "mediatek,mt8188-mt6359-evb", .data = &mt8188_evb_card, },
        { .compatible = "mediatek,mt8188-nau8825", .data = &mt8188_nau8825_card, },
+       { .compatible = "mediatek,mt8188-rt5682s", .data = &mt8188_rt5682s_card, },
        { /* sentinel */ },
 };
 MODULE_DEVICE_TABLE(of, mt8188_mt6359_dt_match);