From nobody Sat Sep 21 09:34:41 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 C1D4AFA3740 for ; Mon, 31 Oct 2022 12:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231429AbiJaMXG (ORCPT ); Mon, 31 Oct 2022 08:23:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231320AbiJaMWv (ORCPT ); Mon, 31 Oct 2022 08:22:51 -0400 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C06BEF5AB for ; Mon, 31 Oct 2022 05:22:36 -0700 (PDT) Received: by mail-pj1-x1035.google.com with SMTP id m6-20020a17090a5a4600b00212f8dffec9so10171720pji.0 for ; Mon, 31 Oct 2022 05:22:36 -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=8MOAU43uzzEUBwcN8jl9h6i5tY3MCh/3gF6pphcM5rw=; b=xN7tZuq2qouAUfQeHfc1L09Per4c9T2dfiX3qbfhPmIHtEpLihIg5PUhpTLg4cy6Yz y4qRiWhmHwBlpXJ29ln1E28k7ZzojpUiQKRbv9wZLFEhOr0Z942UjtTXEfeimin3jDqa neD3zqkPD662BsriBkWqUIVqFs4EfQqZDqFkWyoOP3nau+pvtuuuTCrxPtIHI/GnqzQm 0sVgDmgPPSNmx9cwmnDeaAkfefXEJfd75ywNTMS2PqMgugfqehY62FXP4MSugTcp/RG8 fJqsXymPgQMRD3XCT/djPuBES7ykfUoXAsTLjqKrJz9DfqFUAAcaG1dKG+mMr356jFzl bmyg== 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=8MOAU43uzzEUBwcN8jl9h6i5tY3MCh/3gF6pphcM5rw=; b=4t7JwhnK/m5w/GK2TSu33K8AXaCc85ShtuZ3deXPU9wEGRua3caiQ5PYuWpwxVACqH Pfe/5xn5DeKJDohIDXYQnNN0z461G1Vzr5kgUwplONv1GtaAc4LFCitSEyfA6hqNsOMc 6ndxvmZyFLh2WUgtVs9DzA4/hyGhd0JWMDKXM4ijYy1yV62HBmOMmjZXjooICj7VcNSP QWPQud2R2Fn/3rv7w1yXUo+a01T8+q+wi4VDHp2DjAjVmfDH+nrfzDbNDRSvLvDqCyTL afSfzfx0vEhNypnO0ZmVwPhbUnbLjk6qjr3AiksrgiwKYsZFdnqN79aR84j/ODmXJNiQ 4RJA== X-Gm-Message-State: ACrzQf2HHu6rYPUtOaZ3o84CkodNmPQrDU2rnf1oK0jCKPoR0rJia/TE KSRd25IZVHpuQhtacILHobQBIs8lpxLNsA== X-Google-Smtp-Source: AMsMyM6YF1Ot+9V5drlAzDff3KujPHKAXkBxz0hQIsb2pJJFxWRH1341O2ZxT8TggMSOEsuLif+hKA== X-Received: by 2002:a17:90a:b00d:b0:212:f91d:88c7 with SMTP id x13-20020a17090ab00d00b00212f91d88c7mr14690544pjq.112.1667218956067; Mon, 31 Oct 2022 05:22:36 -0700 (PDT) Received: from localhost.localdomain (118-167-185-125.dynamic-ip.hinet.net. [118.167.185.125]) by smtp.gmail.com with ESMTPSA id y123-20020a623281000000b0056bf24f0837sm4445483pfy.166.2022.10.31.05.22.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 05:22:35 -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 v5 1/2] ASoC: mediatek: dt-bindings: modify machine bindings for two MICs case Date: Mon, 31 Oct 2022 20:22:23 +0800 Message-Id: <20221031122224.1846221-2-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031122224.1846221-1-ajye_huang@compal.corp-partner.google.com> References: <20221031122224.1846221-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" Add a property "dmic-gpios" for switching between two MICs. Signed-off-by: Ajye Huang Acked-by: Rob Herring --- .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-r= t5682s.yaml b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-= rt5682s.yaml index 4fc5b045d3cf..9d3139990237 100644 --- a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.= yaml +++ b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.= yaml @@ -21,6 +21,13 @@ properties: $ref: "/schemas/types.yaml#/definitions/phandle" description: The phandle of MT8186 ASoC platform. =20 + dmic-gpios: + maxItems: 1 + description: + dmic-gpios optional prop for switching between two DMICs. + Ex, the GPIO can control a MUX HW component to select + dmic clk and data form a Front or Rear dmic. + headset-codec: type: object additionalProperties: false @@ -63,14 +70,19 @@ required: =20 examples: - | + #include =20 sound: mt8186-sound { compatible =3D "mediatek,mt8186-mt6366-rt1019-rt5682s-sound"; mediatek,platform =3D <&afe>; pinctrl-names =3D "aud_clk_mosi_off", - "aud_clk_mosi_on"; + "aud_clk_mosi_on", + "aud_gpio_dmic_sec"; pinctrl-0 =3D <&aud_clk_mosi_off>; pinctrl-1 =3D <&aud_clk_mosi_on>; + pinctrl-2 =3D <&aud_gpio_dmic_sec>; + + dmic-gpios =3D <&pio 23 GPIO_ACTIVE_HIGH>; =20 headset-codec { sound-dai =3D <&rt5682s>; --=20 2.25.1 From nobody Sat Sep 21 09:34:41 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 B3EF9C38A02 for ; Mon, 31 Oct 2022 12:23:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231436AbiJaMXJ (ORCPT ); Mon, 31 Oct 2022 08:23:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48874 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231328AbiJaMWv (ORCPT ); Mon, 31 Oct 2022 08:22:51 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD443F5A5 for ; Mon, 31 Oct 2022 05:22:40 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id io19so10573343plb.8 for ; Mon, 31 Oct 2022 05:22:40 -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=/CLvTkmlFURtDEd8JKfEk5mMDoaPLqHdlnnztyHVUao=; b=DJS521KcIHPCJ9eaNPWTwaHuWUYbZfPDTzZXQG88x6uJk4Wt5/kzoc6wvPVphPxF/5 km4WBV9ssJsQKNUEkkRKgHrhFb/PO/Z5Sst6nizZH8TD9iV/dnOri9O19SgjzsBze91q WMUS5FUTXme0/4Y9iFBV9YnSwoXpglm1YvL7JtKPoQRHv9vNsmFGmKnhpWRPWGf++Jlg 44r6lJeiMoNw5r0RQ0TEUm6+q/uk/NC9DF+dEtEeiyRKQhmBZAtLGln6rV98mzyOmewc 0RptUapa7XUa+2BbeEWHgRkMGAknfhYfU927Eh7zTZylPv9T/5ClC+qyda2yOr4+zCPP plxQ== 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=/CLvTkmlFURtDEd8JKfEk5mMDoaPLqHdlnnztyHVUao=; b=vgMGq20+E79B2pR5e1XHzXFiNtoLBlTkKPszqzNoWpsr6Qe/mvfBcE+WdpLLlaEECB 1A7Wur+8i7Njt+mQDzcYru14LUFoIrtp0WPcQHMG+G8ClLiI/D5zNYlDymSRIDNqhSPX cv6ErL9L1xNyxuQOIQm3pkkfR5t2YPVX3dcJA2gZ796jIL5EdJ/cRzqOsRxcK/PXV6l3 yGPnXRw3yAu3XlSlYttFj6aRCo8xV3LWYNs6znuZV3EqT76ts5Irx9Fdk/CNsmSaHiUv ZCUWpLCMxNGgE4Cqq01UN/0+9FnwVY5Z9fWp6DQxYPxsbDjxxd+L+rmu6cobHcaWqT65 zDsA== X-Gm-Message-State: ACrzQf3twNGvIhcW/nLjv6k+4MPuH1XZSOBZSut3JCeBmAICf3r7WHr+ TJtwdT05hZqJF/YojEnYYQ4q1FvWjkTvjw== X-Google-Smtp-Source: AMsMyM786kSZRjJCReEVut41wP+fuMb8Dy0XrAMKUZRpQQGaLqg99Nn+pq8yjYWwuHpqRuAaDs+v1A== X-Received: by 2002:a17:90a:bf15:b0:213:2ef9:18d6 with SMTP id c21-20020a17090abf1500b002132ef918d6mr32651305pjs.70.1667218960110; Mon, 31 Oct 2022 05:22:40 -0700 (PDT) Received: from localhost.localdomain (118-167-185-125.dynamic-ip.hinet.net. [118.167.185.125]) by smtp.gmail.com with ESMTPSA id y123-20020a623281000000b0056bf24f0837sm4445483pfy.166.2022.10.31.05.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 05:22:39 -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 v5 2/2] ASoC: mediatek: mt8186-rt5682: Modify machine driver for two DMICs case Date: Mon, 31 Oct 2022 20:22:24 +0800 Message-Id: <20221031122224.1846221-3-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031122224.1846221-1-ajye_huang@compal.corp-partner.google.com> References: <20221031122224.1846221-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 | 102 +++++++++++++++++- 1 file changed, 101 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..75351734464c 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,14 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(st= ruct platform_device *pdev) =20 soc_card_data->mach_priv =3D mach_priv; =20 + 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