From nobody Fri Sep 20 11:35:05 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D3B3E7F15E for ; Wed, 27 Sep 2023 03:58:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229741AbjI0D6K (ORCPT ); Tue, 26 Sep 2023 23:58:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229691AbjI0D4b (ORCPT ); Tue, 26 Sep 2023 23:56:31 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EC2C4494 for ; Tue, 26 Sep 2023 20:36:20 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-690d2441b95so7701706b3a.1 for ; Tue, 26 Sep 2023 20:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20230601.gappssmtp.com; s=20230601; t=1695785779; x=1696390579; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=4dZFig+3lzqh/aktoSPWYMfOgcYhjyowi8/cXJ999RM=; b=a75UnDWZDB02UXRB5WCNSnD7lQv+0YXiY8gOE/DsP+XQ2vGvCMw3PZygFoeo6MgEss tQ9TaGTujL+Btd0qSt4a9vN6HD/Rj0tS7AEXd9sa8ccE7823XHDDYIIISJNx3+shz6a1 11jOk5fwKb2G0EG/nMryK2l4vOon+D6NhRxxQitPErlgNjUikJexA7h6fnVFhGqQ3QuT 5NiDqpqhTkdvtUaNQQULlPTgRRiHjJKqUlKugOe0f5wP5ZeQQ2GV5Jbc5tCUa2GsuBI5 +yMoOpNfIXHan6qNdNZNyBhJIv+a4umdbyZuZbjIz+rWWEJGiXHB2vFZq08rD7alFU0s rg3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695785779; x=1696390579; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4dZFig+3lzqh/aktoSPWYMfOgcYhjyowi8/cXJ999RM=; b=WZQFkNUk+sY8qdSNZ4aNDp2xdEsfqMdb3KCSnyGqZUh4mW8QD6gBmvu57BoTuzBrx3 dsG3MJ+3DTyjQlsO/hrrMQCNzPN67OO/d4pdaNzOGMkDvZlcijBsmBEoXgd5v7CAhMZE jALpOnAKfnNsPhEk1WD0Jsa5XmwcCc/kZYyD6voB+vJpbF8MKhRPRi+w9F3qHc0pHsga V7N0zOxfyRrfCPZlkjzkAVrpDmQyndtCn3B1dGvCjdoEGwPikvQYoDQEFkPhZYm3Rpqk n946raOrfXVJWOcz3WmD9alzcLNH/F59HTNQqbZOsI+ms4Xd5baLMLCH2tPXkYTSjLpg obHw== X-Gm-Message-State: AOJu0YxkIIAbobDQXLwVmdjs3h1JlCV913QzkaLV0I3yC/Mjoqiam6pM cluAOlGf3sxe4L92XAip6J3S9w== X-Google-Smtp-Source: AGHT+IECPIa3OEa/VOUrQGvdi+LlV4SzWBSp039xcVtZI1syUXVx65cyhfC41kTUUSGf0HWo37eDZw== X-Received: by 2002:a62:ee06:0:b0:68f:a92a:8509 with SMTP id e6-20020a62ee06000000b0068fa92a8509mr5668270pfi.7.1695785779387; Tue, 26 Sep 2023 20:36:19 -0700 (PDT) Received: from ubuntu.huaqin.com ([101.78.151.205]) by smtp.gmail.com with ESMTPSA id i14-20020aa787ce000000b006870ed427b2sm11067570pfo.94.2023.09.26.20.36.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 20:36:19 -0700 (PDT) From: xiazhengqiao To: broonie@kernel.org, robh+dt@kernel.org, tiwai@suse.com, trevor.wu@mediatek.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, patchwork-bot@kernel.org Cc: xiazhengqiao Subject: [v3 2/2] ASoC: mediatek: mt8188-mt6359: add rt5682s support Date: Wed, 27 Sep 2023 11:36:08 +0800 Message-Id: <20230927033608.16920-3-xiazhengqiao@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230927033608.16920-1-xiazhengqiao@huaqin.corp-partner.google.com> References: <20230927033608.16920-1-xiazhengqiao@huaqin.corp-partner.google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To use RT5682S as the codec and MAX98390 as the amp, add a new sound card named mt8188_rt5682s. Signed-off-by: xiazhengqiao Reviewed-by: Trevor Wu --- sound/soc/mediatek/Kconfig | 1 + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 141 +++++++++++++++++++++- 2 files changed, 140 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 8d1bc8814486..43c8fea00439 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -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. diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek= /mt8188/mt8188-mt6359.c index e2416b981e1f..66f246126728 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -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) =20 #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" =20 +#define RT5682S_CODEC_DAI "rt5682s-aif1" + /* FE */ SND_SOC_DAILINK_DEFS(playback2, DAILINK_COMP_ARRAY(COMP_CPU("DL2")), @@ -258,6 +261,17 @@ static struct snd_soc_jack_pin nau8825_jack_pins[] =3D= { }, }; =20 +static struct snd_soc_jack_pin rt5682s_jack_pins[] =3D { + { + .pin =3D "Headphone Jack", + .mask =3D SND_JACK_HEADPHONE, + }, + { + .pin =3D "Headset Mic", + .mask =3D SND_JACK_MICROPHONE, + }, +}; + struct mt8188_card_data { const char *name; unsigned long quirk; @@ -316,10 +330,18 @@ static const struct snd_soc_dapm_widget mt8188_nau882= 5_widgets[] =3D { SND_SOC_DAPM_HP("Headphone Jack", NULL), }; =20 +static const struct snd_soc_dapm_widget mt8188_rt5682s_widgets[] =3D { + SND_SOC_DAPM_HP("Headphone Jack", NULL), +}; + static const struct snd_kcontrol_new mt8188_nau8825_controls[] =3D { SOC_DAPM_PIN_SWITCH("Headphone Jack"), }; =20 +static const struct snd_kcontrol_new mt8188_rt5682s_controls[] =3D { + SOC_DAPM_PIN_SWITCH("Headphone Jack"), +}; + static const struct snd_soc_dapm_route mt8188_mt6359_routes[] =3D { /* SOF Uplink */ {SOF_DMA_UL4, NULL, "O034"}, @@ -772,6 +794,55 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pc= m_runtime *rtd) return 0; }; =20 +static int mt8188_rt5682s_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_card *card =3D rtd->card; + struct mtk_soc_card_data *soc_card_data =3D snd_soc_card_get_drvdata(card= ); + struct mt8188_mt6359_priv *priv =3D soc_card_data->mach_priv; + struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; + struct snd_soc_jack *jack =3D &priv->headset_jack; + int ret; + + ret =3D snd_soc_dapm_new_controls(&card->dapm, mt8188_rt5682s_widgets, + ARRAY_SIZE(mt8188_rt5682s_widgets)); + if (ret) { + dev_err(rtd->dev, "unable to add rt5682s card widget, ret %d\n", ret); + return ret; + } + + ret =3D snd_soc_add_card_controls(card, mt8188_rt5682s_controls, + ARRAY_SIZE(mt8188_rt5682s_controls)); + if (ret) { + dev_err(rtd->dev, "unable to add rt5682s card controls, ret %d\n", ret); + return ret; + } + + ret =3D 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, + rt5682s_jack_pins, + ARRAY_SIZE(rt5682s_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 =3D 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 =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; @@ -779,6 +850,13 @@ static void mt8188_nau8825_codec_exit(struct snd_soc_p= cm_runtime *rtd) snd_soc_component_set_jack(component, NULL, NULL); } =20 +static void mt8188_rt5682s_codec_exit(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component =3D asoc_rtd_to_codec(rtd, 0)->compon= ent; + + 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 +891,51 @@ static const struct snd_soc_ops mt8188_nau8825_ops =3D= { .hw_params =3D mt8188_nau8825_hw_params, }; =20 +static int mt8188_rt5682s_i2s_hw_params(struct snd_pcm_substream *substrea= m, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd =3D substream->private_data; + struct snd_soc_card *card =3D rtd->card; + struct snd_soc_dai *cpu_dai =3D asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai =3D asoc_rtd_to_codec(rtd, 0); + unsigned int rate =3D params_rate(params); + int bitwidth; + int ret; + + bitwidth =3D snd_pcm_format_width(params_format(params)); + if (bitwidth < 0) { + dev_err(card->dev, "invalid bit width: %d\n", bitwidth); + return bitwidth; + } + + ret =3D 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 =3D 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 =3D 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 =3D { + .hw_params =3D 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 +1271,7 @@ static void mt8188_fixup_controls(struct snd_soc_card= *card) struct mt8188_card_data *card_data =3D (struct mt8188_card_data *)priv->p= rivate_data; struct snd_kcontrol *kctl; =20 - 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; =20 for_each_card_widgets_safe(card, w, next_w) { @@ -1190,6 +1313,7 @@ static int mt8188_mt6359_dev_probe(struct platform_de= vice *pdev) struct snd_soc_dai_link *dai_link; bool init_mt6359 =3D false; bool init_nau8825 =3D false; + bool init_rt5682s =3D false; bool init_max98390 =3D false; bool init_dumb =3D false; int ret, i; @@ -1306,6 +1430,13 @@ static int mt8188_mt6359_dev_probe(struct platform_d= evice *pdev) dai_link->exit =3D mt8188_nau8825_codec_exit; init_nau8825 =3D true; } + } else if (!strcmp(dai_link->codecs->dai_name, RT5682S_CODEC_DAI)) { + dai_link->ops =3D &mt8188_rt5682s_i2s_ops; + if (!init_rt5682s) { + dai_link->init =3D mt8188_rt5682s_codec_init; + dai_link->exit =3D mt8188_rt5682s_codec_exit; + init_rt5682s =3D true; + } } else { if (strcmp(dai_link->codecs->dai_name, "snd-soc-dummy-dai")) { if (!init_dumb) { @@ -1343,9 +1474,15 @@ static struct mt8188_card_data mt8188_nau8825_card = =3D { .quirk =3D NAU8825_HS_PRESENT, }; =20 +static struct mt8188_card_data mt8188_rt5682s_card =3D { + .name =3D "mt8188_rt5682s", + .quirk =3D RT5682S_HS_PRESENT, +}; + static const struct of_device_id mt8188_mt6359_dt_match[] =3D { { .compatible =3D "mediatek,mt8188-mt6359-evb", .data =3D &mt8188_evb_car= d, }, { .compatible =3D "mediatek,mt8188-nau8825", .data =3D &mt8188_nau8825_ca= rd, }, + { .compatible =3D "mediatek,mt8188-rt5682s", .data =3D &mt8188_rt5682s_ca= rd, }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mt8188_mt6359_dt_match); --=20 2.17.1