From patchwork Tue Nov 3 10:30:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ajye huang X-Patchwork-Id: 11876671 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 195CA6A2 for ; Tue, 3 Nov 2020 10:31:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA57622404 for ; Tue, 3 Nov 2020 10:31:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qEcXY4b5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728168AbgKCKb2 (ORCPT ); Tue, 3 Nov 2020 05:31:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728164AbgKCKb0 (ORCPT ); Tue, 3 Nov 2020 05:31:26 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3171EC0613D1; Tue, 3 Nov 2020 02:31:26 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id 13so13810418pfy.4; Tue, 03 Nov 2020 02:31:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mdVPkO/q4ig27b41Ma0ipj3qPAj1LWAThPCU+KMAntY=; b=qEcXY4b5+HsZ8QmEcS2mZoob/YDmUeALkVfKMydU//PeD4Rq2m9kJwiGgtCJBz6UgX IZdR84A6YmHIvUL09z/m+0oYjTfneLbMddaB0sEu8+oBLMlN9EFFLh/NrvH7AhwJUDgo 5kzT/wuWml2sOih/jxF68j2HeUeNjnWsT/RXz6vHL5/fxVRCw3PivqoWd/xLsJogmNy4 2pE2rlkfbSyd5aRYQ7uZvoXd+QX2s27UJVL5Ig9q2f/aKmKhge9RoWaTlrq+Pm6jCXOF 475KXOHVGFP4DwO3DJCfRwbep7EN6znzEHGvdfsSMfJBtaxCN2KxxmIe6JVY1iKJYUpI jvAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mdVPkO/q4ig27b41Ma0ipj3qPAj1LWAThPCU+KMAntY=; b=R4q/DRqMwzvGxGFmH44eOz46HWiG+HROni3IV3cS3r4mNbQmSWaKfKvXvToqkMMl/+ mkKBe4wSODvMOeEJgx0qHjfEFvbv4i/JZECqRi9NkEHTrfUmGD7KXjWyn8mUpPhBum/g cAHXDc0KZhTL+oJaNQR/Z6NDPegfly5Ag56WEDQZHlIBVwcXUR8z5xQMxPSeBaq2CYXe sSKMEQKa66icf3wQaro7JBQLF/eKkt606rBy1eTe6UL3gsmtbpW024tPb0jnYkzlyati aqYwbZTnipYZQ3pzLlYr3dApFSVRuR9B6sRWoSjtzUHoL8mxd7JU0wJEIACk81FpajbO IVCg== X-Gm-Message-State: AOAM5304AFVrzaF3FaE81l4a6KwH+CN/bukNrm/zW+G0PDiqGNhW3Lv/ aO0h1oGH33ViclNt8g3P/48Enapdm/0Y3g== X-Google-Smtp-Source: ABdhPJx5yus/r8C+63EtUuVe15Jc9Q3Xu6wxrB3O21Hs9YTeDXWxR2YQfWWRJYnszdqtEUVpE7YyMA== X-Received: by 2002:a17:90a:d246:: with SMTP id o6mr3085560pjw.14.1604399485498; Tue, 03 Nov 2020 02:31:25 -0800 (PST) Received: from localhost (114-34-18-97.HINET-IP.hinet.net. [114.34.18.97]) by smtp.gmail.com with ESMTPSA id v16sm14733951pgk.26.2020.11.03.02.31.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 02:31:24 -0800 (PST) From: Ajye Huang X-Google-Original-From: Ajye Huang To: linux-kernel@vger.kernel.org Cc: Mark Brown , Rohit kumar , Banajit Goswami , Patrick Lai , Srinivasa Rao Mandadapu , srinivas.kandagatla@linaro.org, Andy Gross , Bjorn Andersson , Liam Girdwood , Rob Herring , Jaroslav Kysela , cychiang@chromium.org, tzungbi@chromium.org, dianders@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Ajye Huang Subject: [PATCH v5 1/2] ASoC: google: dt-bindings: modify machine bindings for two MICs case Date: Tue, 3 Nov 2020 18:30:50 +0800 Message-Id: <20201103103051.34553-2-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201103103051.34553-1-ajye_huang@compal.corp-partner.google.com> References: <20201103103051.34553-1-ajye_huang@compal.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add a property "dmic-gpios" for switching between two MICs. Signed-off-by: Ajye Huang --- .../bindings/sound/google,sc7180-trogdor.yaml | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml index efc34689d6b5..9e0505467e57 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml @@ -34,6 +34,9 @@ properties: "#size-cells": const: 0 + dmic-gpios: + description: GPIO for switching between DMICs + patternProperties: "^dai-link(@[0-9])?$": description: @@ -81,6 +84,7 @@ additionalProperties: false examples: - | + //Example 1 sound { compatible = "google,sc7180-trogdor"; model = "sc7180-rt5682-max98357a-1mic"; @@ -128,3 +132,57 @@ examples: }; }; }; + + - | + //Example 2 (2mic case) + sound { + compatible = "google,sc7180-trogdor"; + model = "sc7180-rt5682-max98357a-2mic"; + + audio-routing = + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR"; + + #address-cells = <1>; + #size-cells = <0>; + + dmic-gpios = <&tlmm 86 0>; + + dai-link@0 { + link-name = "MultiMedia0"; + reg = <0>; + cpu { + sound-dai = <&lpass_cpu 0>; + }; + + codec { + sound-dai = <&alc5682 0>; + }; + }; + + dai-link@1 { + link-name = "MultiMedia1"; + reg = <1>; + cpu { + sound-dai = <&lpass_cpu 1>; + }; + + codec { + sound-dai = <&max98357a>; + }; + }; + + dai-link@2 { + link-name = "MultiMedia2"; + reg = <2>; + cpu { + sound-dai = <&lpass_hdmi 0>; + }; + + codec { + sound-dai = <&msm_dp>; + }; + }; + }; + +... From patchwork Tue Nov 3 10:30:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ajye huang X-Patchwork-Id: 11876675 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 586C7697 for ; Tue, 3 Nov 2020 10:31:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2F0E7206C0 for ; Tue, 3 Nov 2020 10:31:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zseu6A+s" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728183AbgKCKbf (ORCPT ); Tue, 3 Nov 2020 05:31:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728166AbgKCKbd (ORCPT ); Tue, 3 Nov 2020 05:31:33 -0500 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69026C0613D1; Tue, 3 Nov 2020 02:31:32 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id a200so13795932pfa.10; Tue, 03 Nov 2020 02:31:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bCp02/KdQKO37j/RsLXZ8/YoseoQ3xQo6vzDe5cyZuo=; b=Zseu6A+sUJ9lasjDV8hiHRl/01jz3L9WFs+HVKMDzDzI+vPXIKxxMcds1hZxm4hPSV 9Xw+QXdOdhDVZju7eKD4SG3bHwGjoe9mGuddKbZnft2KSlsw9rofcXV735EQ0J9QDs5m GeRAf5Ofbmol44mTTQdFrK8pF384e1Ha0VMc9fmwlIyi+BWGVyKYSN/uKrkewvPRr4c0 ZLaKXkMi89YhHqNDp1Eg56WA4wcA9Ff6CbMCGg42jcSXGhtL6whf0Bz9G4xgJAeURT3o WJ8cC4GAtE8icVF+kdIqOuRkqa96C84RfxLtHp7Sz9gl3e/uuCU5NqYbJ0cwpJgwwcFq nejA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bCp02/KdQKO37j/RsLXZ8/YoseoQ3xQo6vzDe5cyZuo=; b=EDinkdJGceiZsVHhI1UJZ9ZZWToHroDHa8jbMll1cMPJv95aCcgmVz+YtjQ6ESrXk1 G8xU7cx0qhAo4o4Xo+Gx5A1iNvMl6vpIemPYR1mZK3DgA5GP7AdEv+6jnSzR1B4W9u0W 7pL5zrtbRsYF+wSzm1l/ErpRFJN1Y9WCyNVQmNy31i5E/UShXTpeVnAe92G+p4B7/imh Csh6OKa+L7dKB1te/O/XHttQi2w1+h7h6MBtCb0niTUzu0AQRwSSuDcWnW+t/Dq+Csyd /0fI4ujM4n3+3XtPE0CPfz7Oaqj9ah3ooqjynIFavAvLet9y3zXT37PJVe84kFndLkwB B1NA== X-Gm-Message-State: AOAM532LoYW0EIIy2WCjcME4jQU0eVqG0FoBevRpp/8iUUWoxXG8Gfv6 guwITK5OJ5WJHJZhH/7azRrJJOHIH4byYA== X-Google-Smtp-Source: ABdhPJylHN6oMpdK315HaNSR0crS7syC1umsQO/uVsaWA2GUuUYNWrIXXW2SwONfN2yfdgx7MCf2OQ== X-Received: by 2002:a17:90a:db18:: with SMTP id g24mr639271pjv.175.1604399491785; Tue, 03 Nov 2020 02:31:31 -0800 (PST) Received: from localhost (114-34-18-97.HINET-IP.hinet.net. [114.34.18.97]) by smtp.gmail.com with ESMTPSA id a25sm2553668pfg.138.2020.11.03.02.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 02:31:31 -0800 (PST) From: Ajye Huang X-Google-Original-From: Ajye Huang To: linux-kernel@vger.kernel.org Cc: Mark Brown , Rohit kumar , Banajit Goswami , Patrick Lai , Srinivasa Rao Mandadapu , srinivas.kandagatla@linaro.org, Andy Gross , Bjorn Andersson , Liam Girdwood , Rob Herring , Jaroslav Kysela , cychiang@chromium.org, tzungbi@chromium.org, dianders@chromium.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Ajye Huang , Tzung-Bi Shih Subject: [PATCH v5 2/2] ASoC: qcom: sc7180: Modify machine driver for 2mic Date: Tue, 3 Nov 2020 18:30:51 +0800 Message-Id: <20201103103051.34553-3-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201103103051.34553-1-ajye_huang@compal.corp-partner.google.com> References: <20201103103051.34553-1-ajye_huang@compal.corp-partner.google.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org In addition, having mixer control to switch between DMICs by using "dmic-gpios" property. Refer to this one as an example, commit b7a742cff3f6 ("ASoC: AMD: Use mixer control to switch between DMICs") Signed-off-by: Ajye Huang Reviewed-by: Tzung-Bi Shih --- sound/soc/qcom/sc7180.c | 61 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/sound/soc/qcom/sc7180.c b/sound/soc/qcom/sc7180.c index b391f64c3a80..455d3f2b8ce8 100644 --- a/sound/soc/qcom/sc7180.c +++ b/sound/soc/qcom/sc7180.c @@ -5,6 +5,8 @@ // sc7180.c -- ALSA SoC Machine driver for SC7180 #include +#include +#include #include #include #include @@ -28,6 +30,8 @@ struct sc7180_snd_data { u32 pri_mi2s_clk_count; struct snd_soc_jack hs_jack; struct snd_soc_jack hdmi_jack; + struct gpio_desc *dmic_sel; + int dmic_switch; }; static void sc7180_jack_free(struct snd_jack *jack) @@ -169,6 +173,27 @@ static int sc7180_snd_startup(struct snd_pcm_substream *substream) return 0; } +static int dmic_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); + + ucontrol->value.integer.value[0] = data->dmic_switch; + return 0; +} + +static int dmic_set(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_dapm(kcontrol); + struct sc7180_snd_data *data = snd_soc_card_get_drvdata(dapm->card); + + data->dmic_switch = ucontrol->value.integer.value[0]; + gpiod_set_value(data->dmic_sel, data->dmic_switch); + return 0; +} + static void sc7180_snd_shutdown(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -206,6 +231,30 @@ static const struct snd_soc_dapm_widget sc7180_snd_widgets[] = { SND_SOC_DAPM_MIC("Headset Mic", NULL), }; +static const char * const dmic_mux_text[] = { + "Front Mic", + "Rear Mic", +}; + +static SOC_ENUM_SINGLE_DECL(sc7180_dmic_enum, + SND_SOC_NOPM, 0, dmic_mux_text); + +static const struct snd_kcontrol_new sc7180_dmic_mux_control = + SOC_DAPM_ENUM_EXT("DMIC Select Mux", sc7180_dmic_enum, + dmic_get, dmic_set); + +static const struct snd_soc_dapm_widget sc7180_snd_dual_mic_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC", NULL), + SND_SOC_DAPM_MUX("Dmic Mux", SND_SOC_NOPM, 0, 0, &sc7180_dmic_mux_control), +}; + +static const struct snd_soc_dapm_route sc7180_snd_dual_mic_audio_route[] = { + {"Dmic Mux", "Front Mic", "DMIC"}, + {"Dmic Mux", "Rear Mic", "DMIC"}, +}; + static void sc7180_add_ops(struct snd_soc_card *card) { struct snd_soc_dai_link *link; @@ -238,6 +287,18 @@ static int sc7180_snd_platform_probe(struct platform_device *pdev) card->dapm_widgets = sc7180_snd_widgets; card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_widgets); + if (of_property_read_bool(dev->of_node, "dmic-gpios")) { + card->dapm_widgets = sc7180_snd_dual_mic_widgets, + card->num_dapm_widgets = ARRAY_SIZE(sc7180_snd_dual_mic_widgets), + card->dapm_routes = sc7180_snd_dual_mic_audio_route, + card->num_dapm_routes = ARRAY_SIZE(sc7180_snd_dual_mic_audio_route), + data->dmic_sel = devm_gpiod_get(&pdev->dev, "dmic", GPIOD_OUT_LOW); + if (IS_ERR(data->dmic_sel)) { + dev_err(&pdev->dev, "DMIC gpio failed err=%ld\n", PTR_ERR(data->dmic_sel)); + return PTR_ERR(data->dmic_sel); + } + } + ret = qcom_snd_parse_of(card); if (ret) return ret;