From patchwork Fri Nov 6 06:14:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajye Huang X-Patchwork-Id: 321139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 150F1C4741F for ; Fri, 6 Nov 2020 06:14:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A531120B80 for ; Fri, 6 Nov 2020 06:14:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j3j3Ypm3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726200AbgKFGOr (ORCPT ); Fri, 6 Nov 2020 01:14:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726190AbgKFGOr (ORCPT ); Fri, 6 Nov 2020 01:14:47 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1655DC0613CF; Thu, 5 Nov 2020 22:14:46 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id z3so356181pfz.6; Thu, 05 Nov 2020 22:14:46 -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=l5wJhSF1myKTxNCEOkUYzTRb2ml1CsAb8yYtcmdDQEc=; b=j3j3Ypm3ruFiRx011vvNly7A5X1a5FTVUBD0VHrZdFLR2zwy/mlqzqfssGSOSUX7kz MieivpEEWrdLOc1R3xFYVIB6oKzXWqyW4jFiVluwTwT7K0Wbt4oe1XsifHVWEtD43WcU SlDwmaEtn8FUGoMr8wiBnYXLRcgTTLoT4eAheSe/5hKUMRdJvbEDhfIYPXZAygzxdIj7 2jzoJ4zmcQqY7LZwBHvbNQGtCDMPML/lCvfroFN7BxyVdyxgKc9qCIFMRS6bAOJghScK bcNOSO/xGqt+3tAZfI2Ner2fjeGL3GWjaTzijlUDG5a1GJGBN1Uio3icMREanKlpTI5T I8aQ== 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=l5wJhSF1myKTxNCEOkUYzTRb2ml1CsAb8yYtcmdDQEc=; b=fprR8dYU68P2wnyqu3Kd3cB0wg4F9bzaBhDxdtPCH1LZnPNeHA8FCPWgxtargCe+IR 3sRhgiimTTaqLBWJLIkO8O8hHqy2we1Z6WxDoQKEURLOOHywC8G2yDWet0eUD5XL+2TI tsuEHNDLtIP5IjTHWoN6XJbgcgQ7wslFU9xyy+grzSFbVjy3K5tpch+pP0A0wV5mYdb1 k7cwVuMR1gZqlGOvOYxqwjmRXVmecIb8xaz+npXfgdIS7KVQWjTbtlNa95Oo/6NlyeHi 3THnVljn+IsyXeAXmKgX7Yd0euaFVtK+/Rtr+dDst4f+yiCsOPcKOhYr8whcJbhl+RYO USfg== X-Gm-Message-State: AOAM530XpJVdcP14MmTPDYfW94miocMlCXBDqC7/XqXxD8aR4N6GXev5 zQGDh+mElMXIwMZ7SoKdua+5ggx0e/Qo4A== X-Google-Smtp-Source: ABdhPJx3Ggm4pls83AmffE9szLmq4frqWWbLnvgrh2jxFHSlCYaeyAYS0j8558fwaKy/sRuhwrFFhQ== X-Received: by 2002:a62:17c8:0:b029:18b:5a97:a8d1 with SMTP id 191-20020a6217c80000b029018b5a97a8d1mr467274pfx.15.1604643285394; Thu, 05 Nov 2020 22:14:45 -0800 (PST) Received: from localhost (114-34-18-97.HINET-IP.hinet.net. [114.34.18.97]) by smtp.gmail.com with ESMTPSA id q5sm746472pjj.26.2020.11.05.22.14.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 22:14:44 -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 , robh@kernel.org, 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 v6 1/2] ASoC: google: dt-bindings: modify machine bindings for two MICs case Date: Fri, 6 Nov 2020 14:14:32 +0800 Message-Id: <20201106061433.1483129-2-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201106061433.1483129-1-ajye_huang@compal.corp-partner.google.com> References: <20201106061433.1483129-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 Reviewed-by: Rob Herring --- .../devicetree/bindings/sound/google,sc7180-trogdor.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml index efc34689d6b5..ce050a9dec94 100644 --- a/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml +++ b/Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml @@ -34,6 +34,10 @@ properties: "#size-cells": const: 0 + dmic-gpios: + maxItems: 1 + description: GPIO for switching between DMICs + patternProperties: "^dai-link(@[0-9])?$": description: @@ -83,7 +87,7 @@ examples: - | sound { compatible = "google,sc7180-trogdor"; - model = "sc7180-rt5682-max98357a-1mic"; + model = "sc7180-rt5682-max98357a-2mic"; audio-routing = "Headphone Jack", "HPOL", @@ -92,6 +96,8 @@ examples: #address-cells = <1>; #size-cells = <0>; + dmic-gpios = <&tlmm 86 0>; + dai-link@0 { link-name = "MultiMedia0"; reg = <0>; From patchwork Fri Nov 6 06:14:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajye Huang X-Patchwork-Id: 319406 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1ED9CC388F2 for ; Fri, 6 Nov 2020 06:14:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B56A8208FE for ; Fri, 6 Nov 2020 06:14:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RPQyg8Vl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726190AbgKFGOv (ORCPT ); Fri, 6 Nov 2020 01:14:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbgKFGOv (ORCPT ); Fri, 6 Nov 2020 01:14:51 -0500 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30688C0613CF; Thu, 5 Nov 2020 22:14:51 -0800 (PST) Received: by mail-pg1-x543.google.com with SMTP id f38so149453pgm.2; Thu, 05 Nov 2020 22:14:51 -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=RPQyg8VlQXYTcKx7JG93r5AqtGwDivqYuef5SRML9Q8LE9NtXaev+IzySz18wcZtD2 KpXVZ1UrZZMdHeov6F9bbIjiXTPHKgtp8QPxDQIblYF6d+X89V3v8mR0KfLTPPLnIWTB bwMOxtHh00t85QaI2uCXsTIv0SDChH85rfy73OwsYRiab5j/GfFNLdZXMDLgrP1x/I8x kirgnzX6G6LF1gduufsKqljmEbiDh8UTLqmSPNB7Dw5KndkxxMPsEFCYhUSwiD8QLQoH RZK0ruxtOgorUO+nz++CbTDA7EDAH3gjtEeoguGuB1K74evvp73fNP1Tyuo0R0X+0wyl tGKw== 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=DUK8DANf+byuIlwUnnFUZcVbCxTDzxpt5Ui04R9qe8WUyvDmGKJhKHG2QLxbtXUR7x ZNrLQw/crlL1voILtzsdgfJVWFn60JDu4vTkAszpp2+AG0M+nOnnRa6fzgAKVl90Hl9K Qa7px66M2FHgI4oCS557OhJSC4bnTXSxhjhc5m3BiH+HLBtYezljbYqedk7CnH0ByawF Oh+XVWkpT+0IvEM3fk/xJQRMN4ASzy5zgD43QWNWMRZLIfXW06IFy2rQjdoI8KIoiVrD lcESLqk8bakrRzKoURQduDHebu6zeQZ9PU/Up5g6b537M6b2mC/VcMEHfbHXNz/LoKsM eK8A== X-Gm-Message-State: AOAM530MebiddSk8nbdcLskdX1HUBolcesh/60P+R8fZlbNyjIU1RaA7 UIDvgUD7Z2mBaT75ZxpeDeMjZWh2QWzSdg== X-Google-Smtp-Source: ABdhPJwYPI2jygviL6WUqycB2ajwbeQhCK7O2POs7mepgfAE5dnjkpnarP8n78DdOzaHEy1DEvBHeQ== X-Received: by 2002:a17:90a:aa15:: with SMTP id k21mr744725pjq.169.1604643290556; Thu, 05 Nov 2020 22:14:50 -0800 (PST) Received: from localhost (114-34-18-97.HINET-IP.hinet.net. [114.34.18.97]) by smtp.gmail.com with ESMTPSA id b2sm425171pgg.2.2020.11.05.22.14.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 22:14:50 -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 , robh@kernel.org, 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 v6 2/2] ASoC: qcom: sc7180: Modify machine driver for 2mic Date: Fri, 6 Nov 2020 14:14:33 +0800 Message-Id: <20201106061433.1483129-3-ajye_huang@compal.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201106061433.1483129-1-ajye_huang@compal.corp-partner.google.com> References: <20201106061433.1483129-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;