From nobody Sat Sep 21 13:49:37 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 77DC9C38A02 for ; Fri, 28 Oct 2022 16:11:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230387AbiJ1QLl (ORCPT ); Fri, 28 Oct 2022 12:11:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230263AbiJ1QLP (ORCPT ); Fri, 28 Oct 2022 12:11:15 -0400 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAEDF22C464 for ; Fri, 28 Oct 2022 09:08:14 -0700 (PDT) Received: by mail-pj1-x1030.google.com with SMTP id c15-20020a17090a1d0f00b0021365864446so4887738pjd.4 for ; Fri, 28 Oct 2022 09:08:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=compal-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p8Nn45kFgt+1/zl+VyWWfD/CuQIYBmtC4EPy4fuEkAU=; b=gip4VKIWXDPUdGVhQB4daJvfaDsL1h/PftU4FOaEYO8E5ovKZQ+xvcEyUwgVeiXxV6 ZeB3LBQs0nzir13iWlS879M7qVzHFU2zq9lnMS3EkSs9AY2O+LKJmT1zc8wOiav6HZOA lr/CTNsY+xOjoaCWgNV9cGOeg3XR9/UVwnQUdiUv01vHn5lcrK5nZyBkr1tjOs0MImET c+UxidVXdI6UGj0ltXIiTg+KzAS/mMFu+T/tWvFoMfuOglr1sojXgyJvHHvUsj7dpZa7 ZHIFyyyZcw9qmznAIIYrqz8jW/AJ0pK/OGkr9zRfPd4Ko0gbamT7D3QxxHydmac5ZKIG 9eRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version: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=p8Nn45kFgt+1/zl+VyWWfD/CuQIYBmtC4EPy4fuEkAU=; b=cIQ+RhybJsw29EFV0gaqFsOqyEYBfZJwrERCYosv/GuZrPAMq2o1hOSusQKhMd6wBJ PQDZZGtwQMdDAfO94xxyNjIRm1W+/HM5VLVl3YwiW1i/bEA/jEOMyl7J0D/M0IkJQpyQ M7Ox8BbeHCYwMGCdAlfIsnw21RsZEmDsUg/uTV/0+pU3UzEODwohc1jMzcm7c372Fx/h 2XBe1rvMM/ccFPPeWnvb3NespGtgKVf5WY5FNXha+rn/mXhNXj5DAkSkGjX+kMvaKANu 7GrbPFEaWfG+Lrlwug4p6CCowX4ipT1M8etvQutSVNHSDj0cet3NaI0HalryTkx2MpFe 5/pg== X-Gm-Message-State: ACrzQf0ixxKdqjaVjtjeJo4etSriBBtKPHAj0ZEQs810eWmTwpKCet+o HZEdXKzrkCsN3eltxcS6kZm0lrUaJuK6ag== X-Google-Smtp-Source: AMsMyM6Ff9ha1gXGmB+slqYXn5um88qhDxWogLqwNuNaAS20732cykx+jATZzSm8t7qnxpNUd7BuHA== X-Received: by 2002:a17:902:e902:b0:186:9c03:5f27 with SMTP id k2-20020a170902e90200b001869c035f27mr97854pld.16.1666973288800; Fri, 28 Oct 2022 09:08:08 -0700 (PDT) Received: from localhost.localdomain (118-167-210-30.dynamic-ip.hinet.net. [118.167.210.30]) by smtp.gmail.com with ESMTPSA id b70-20020a621b49000000b0056abfa74eddsm3112071pfb.147.2022.10.28.09.08.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 09:08:08 -0700 (PDT) From: Ajye Huang To: linux-kernel@vger.kernel.org Cc: Mark Brown , Liam Girdwood , Krzysztof Kozlowski , Rob Herring , linux-mediatek@lists.infradead.org, "chunxu . li" , Takashi Iwai , Jaroslav Kysela , Jiaxin Yu , Matthias Brugger , AngeloGioacchino Del Regno , Ajye Huang , =?UTF-8?q?N=C3=ADcolas=20F=20=2E=20R=20=2E=20A=20=2E=20Prado?= , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org Subject: [PATCH v1 2/2] ASoC: mediatek: mt8186-rt5682: Modify machine driver for two DMICs case Date: Sat, 29 Oct 2022 00:07:33 +0800 Message-Id: <20221028160733.1390230-3-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221028160733.1390230-1-ajye_huang@compal.corp-partner.google.com> References: <20221028160733.1390230-1-ajye_huang@compal.corp-partner.google.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Having two DMICs, a front DMIC and a Rear DMIC, but only host audio input AUX port0 is used for these two Dmics. A "dmic-gpios" property is used for a mixer control to switch the dmic signal source between the Front and Rear Dmic. Refer to this one as an example, commit 3cfbf07c6d27 ("ASoC: qcom: sc7180: Modify machine driver for 2mic") Signed-off-by: Ajye Huang --- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 104 +++++++++++++++++- 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sou= nd/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index 2414c5b77233..7190a60300a1 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -7,6 +7,8 @@ // Author: Jiaxin Yu // =20 +#include +#include #include #include #include @@ -39,6 +41,8 @@ =20 struct mt8186_mt6366_rt1019_rt5682s_priv { struct snd_soc_jack headset_jack, hdmi_jack; + struct gpio_desc *dmic_sel; + int dmic_switch; }; =20 /* Headset jack detection DAPM pins */ @@ -68,6 +72,94 @@ static struct snd_soc_codec_conf mt8186_mt6366_rt1019_rt= 5682s_codec_conf[] =3D { }, }; =20 +static int dmic_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_dapm_context *dapm =3D snd_soc_dapm_kcontrol_dapm(kcontrol= ); + struct mtk_soc_card_data *soc_card_data =3D + snd_soc_card_get_drvdata(dapm->card); + struct mt8186_mt6366_rt1019_rt5682s_priv *priv =3D soc_card_data->mach_pr= iv; + + ucontrol->value.integer.value[0] =3D priv->dmic_switch; + return 0; +} + +static int dmic_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_dapm_context *dapm =3D snd_soc_dapm_kcontrol_dapm(kcontrol= ); + struct mtk_soc_card_data *soc_card_data =3D + snd_soc_card_get_drvdata(dapm->card); + struct mt8186_mt6366_rt1019_rt5682s_priv *priv =3D soc_card_data->mach_pr= iv; + + priv->dmic_switch =3D ucontrol->value.integer.value[0]; + if (priv->dmic_sel) { + gpiod_set_value(priv->dmic_sel, priv->dmic_switch); + dev_info(dapm->card->dev, "dmic_set_value %d\n", + priv->dmic_switch); + } + return 0; +} + +static const char * const dmic_mux_text[] =3D { + "FrontMic", + "RearMic", +}; + +static SOC_ENUM_SINGLE_DECL(mt8186_dmic_enum, + SND_SOC_NOPM, 0, dmic_mux_text); + +static const struct snd_kcontrol_new mt8186_dmic_mux_control =3D + SOC_DAPM_ENUM_EXT("DMIC Select Mux", mt8186_dmic_enum, + dmic_get, dmic_set); + +static const struct snd_soc_dapm_widget dmic_widgets[] =3D { + SND_SOC_DAPM_MIC("DMIC", NULL), + SND_SOC_DAPM_MUX("Dmic Mux", SND_SOC_NOPM, 0, 0, &mt8186_dmic_mux_control= ), +}; + +static const struct snd_soc_dapm_route dmic_map[] =3D { + /* digital mics */ + {"Dmic Mux", "FrontMic", "DMIC"}, + {"Dmic Mux", "RearMic", "DMIC"}, +}; + +static int primary_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 mt8186_mt6366_rt1019_rt5682s_priv *priv =3D soc_card_data->mach_pr= iv; + int ret; + + ret =3D mt8186_mt6366_init(rtd); + + if (ret) { + dev_err(card->dev, "mt8186_mt6366_init failed: %d\n", ret); + return ret; + } + + if (!priv->dmic_sel) { + dev_info(card->dev, "dmic_sel is null\n"); + return ret; + } + + ret =3D snd_soc_dapm_new_controls(&card->dapm, dmic_widgets, + ARRAY_SIZE(dmic_widgets)); + if (ret) { + dev_err(card->dev, "DMic widget addition failed: %d\n", ret); + /* Don't need to add routes if widget addition failed */ + return ret; + } + + ret =3D snd_soc_dapm_add_routes(&card->dapm, dmic_map, + ARRAY_SIZE(dmic_map)); + + if (ret) + dev_err(card->dev, "DMic map addition failed: %d\n", ret); + + return ret; +} + static int mt8186_rt5682s_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *cmpnt_afe =3D @@ -775,7 +867,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5= 682s_dai_links[] =3D { .dpcm_playback =3D 1, .dpcm_capture =3D 1, .ignore_suspend =3D 1, - .init =3D mt8186_mt6366_init, + .init =3D primary_codec_init, SND_SOC_DAILINK_REG(adda), }, { @@ -1015,6 +1107,16 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(st= ruct platform_device *pdev) =20 soc_card_data->mach_priv =3D mach_priv; =20 + if (of_property_read_bool(pdev->dev.of_node, "dmic-gpios")) { + mach_priv->dmic_sel =3D devm_gpiod_get_optional(&pdev->dev, + "dmic", GPIOD_OUT_LOW); + if (IS_ERR(mach_priv->dmic_sel)) { + dev_err(&pdev->dev, "DMIC gpio failed err=3D%ld\n", + PTR_ERR(mach_priv->dmic_sel)); + return PTR_ERR(mach_priv->dmic_sel); + } + } + adsp_node =3D of_parse_phandle(pdev->dev.of_node, "mediatek,adsp", 0); if (adsp_node) { struct mtk_sof_priv *sof_priv; --=20 2.25.1