Received: by 2002:a05:6358:701b:b0:131:369:b2a3 with SMTP id 27csp4005207rwo; Mon, 24 Jul 2023 22:05:28 -0700 (PDT) X-Google-Smtp-Source: APBJJlHJZR7LDE/owjMzoFH6OSKa0iwaZvyhska+kZEoVvMN+LxKC60ZxeS8VplToJu9l6Tyf3y0 X-Received: by 2002:a81:7385:0:b0:583:266a:9085 with SMTP id o127-20020a817385000000b00583266a9085mr8887479ywc.40.1690261527880; Mon, 24 Jul 2023 22:05:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690261527; cv=none; d=google.com; s=arc-20160816; b=B9hq6TPVd79C1GI4ImXIRJnrT+wl1UgX3U/L6wfYGvnIxS81P49CwFHs6MNzKAHohL 8fCThery0npI8XnD2e3R7OY3JYsKKJHgDJ4GYrSITqY/avREIqKfWpTTlI7L0zOCCoSZ XchLSDbTSWrXgNh6R7sPf74+yOJgl8jU+qwRoZkRGCTyBYSTiPeeqyxDqN00fH8NBjGS t2GiJNzEfcOItU/mZwlNKn3bxDNeQA+4t83u6mVWxpj0miov209QlueEO2a6vbj5mq8m WKqADRMVFfLwRm10k3XUrX+2Bjug7uLpnaKlkaoYYwHfiiRdsThmF0vsKBYqXEUzDBN0 Nssw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=bkuFlQZm1wGXwCPWMA9dpYXbQ7euJCFPWKLDx347OEc=; fh=OefNpeZjFU3zRj2edEV1JgSnXinLzjcidQ7oAoONT8A=; b=oxUB2xRDpnVm5GrlxnHPsyvkLStj4GplLQMmyXFDCGJvKeD5uopL5TLMoSJpVRI6Lq BRwUEIRklmOGkv6NuOtSjOnhy97n7tJefq1trBV6MR4axAnGqstmcDFZ/rI8tMCCZF7b MraE+tNzmaSdmwdNptBv5In3oPe5e0JSvC4OeRD1IGT48oCLng5vd658u5i8C2bs29cJ 9efCTFZZqNdmxAzqudmsKmC8Xzag0K6WlQQmTcO5B6Ua1a5hIZmqC+KW6rhb6iZN1D9s KUu/HWhROamtgQsX+bTXIYZo4eXHs3pt7Bqmkwy2uConvWm93a8isZNKg8jX+EhCzGuG sLbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=ubp69Jpr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p40-20020a056a000a2800b006789229c538si11147313pfh.48.2023.07.24.22.05.15; Mon, 24 Jul 2023 22:05:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=ubp69Jpr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230302AbjGYDxT (ORCPT + 99 others); Mon, 24 Jul 2023 23:53:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229945AbjGYDxS (ORCPT ); Mon, 24 Jul 2023 23:53:18 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55E4919A1 for ; Mon, 24 Jul 2023 20:53:13 -0700 (PDT) X-UUID: c414113a2a9e11ee9cb5633481061a41-20230725 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=bkuFlQZm1wGXwCPWMA9dpYXbQ7euJCFPWKLDx347OEc=; b=ubp69JprWmDfGzxGEXavzXr/gV6AImb1kHHIUJ9FvlPUTGtj7rUOfi5zyXeu1/Rfh/9YOFRzAw48yKE2m0A0ZixM/sQ3t4nRlF2cVYj+1c54F70zacFYS+XrAEiZOpNITmT1/TFZhk4OBTOhbAIhyCKaLmCJ9uvNdZNZAN8MZb8=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.29,REQID:8df923d3-a68e-4c15-b743-df486784f5f4,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:70 X-CID-INFO: VERSION:1.1.29,REQID:8df923d3-a68e-4c15-b743-df486784f5f4,IP:0,URL :0,TC:0,Content:-25,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTI ON:quarantine,TS:70 X-CID-META: VersionHash:e7562a7,CLOUDID:575549d2-cd77-4e67-bbfd-aa4eaace762f,B ulkID:230725115308CPP61VZA,BulkQuantity:0,Recheck:0,SF:19|48|38|29|28|17,T C:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 ,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_SDM,TF_CID_SPAM_ASC,TF_CID_SPAM_FAS, TF_CID_SPAM_FSD X-UUID: c414113a2a9e11ee9cb5633481061a41-20230725 Received: from mtkmbs14n2.mediatek.inc [(172.21.101.76)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 418060739; Tue, 25 Jul 2023 11:53:07 +0800 Received: from mtkmbs13n2.mediatek.inc (172.21.101.108) by mtkmbs13n2.mediatek.inc (172.21.101.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Tue, 25 Jul 2023 11:53:06 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Tue, 25 Jul 2023 11:53:06 +0800 From: Trevor Wu To: , , , , , CC: , , , , Subject: [PATCH 1/3] ASoC: mediatek: mt8188-mt6359: support dynamic pinctrl Date: Tue, 25 Jul 2023 11:53:02 +0800 Message-ID: <20230725035304.2864-2-trevor.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230725035304.2864-1-trevor.wu@mediatek.com> References: <20230725035304.2864-1-trevor.wu@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS, T_SCC_BODY_TEXT_LINE,T_SPF_TEMPERROR,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To avoid power leakage, it is recommended to replace the default pinctrl state with dynamic pinctrl since certain audio pinmux functions can remain in a HIGH state even when audio is disabled. Linking pinctrl with DAPM using SND_SOC_DAPM_PINCTRL will ensure that audio pins remain in GPIO mode by default and only switch to an audio function when necessary. Signed-off-by: Trevor Wu --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index 7c9e08e6a4f5..667d79f33bf2 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -246,6 +246,11 @@ static const struct snd_soc_dapm_widget mt8188_mt6359_widgets[] = { SND_SOC_DAPM_MIC("Headset Mic", NULL), SND_SOC_DAPM_SINK("HDMI"), SND_SOC_DAPM_SINK("DP"), + + /* dynamic pinctrl */ + SND_SOC_DAPM_PINCTRL("ETDM_SPK_PIN", "aud_etdm_spk_on", "aud_etdm_spk_off"), + SND_SOC_DAPM_PINCTRL("ETDM_HP_PIN", "aud_etdm_hp_on", "aud_etdm_hp_off"), + SND_SOC_DAPM_PINCTRL("MTKAIF_PIN", "aud_mtkaif_on", "aud_mtkaif_off"), }; static const struct snd_kcontrol_new mt8188_mt6359_controls[] = { @@ -267,6 +272,7 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct snd_soc_component *cmpnt_codec = asoc_rtd_to_codec(rtd, 0)->component; + struct snd_soc_dapm_widget *pin_w = NULL, *w; struct mtk_base_afe *afe; struct mt8188_afe_private *afe_priv; struct mtkaif_param *param; @@ -306,6 +312,18 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) return 0; } + for_each_card_widgets(rtd->card, w) { + if (!strcmp(w->name, "MTKAIF_PIN")) { + pin_w = w; + break; + } + } + + if (!pin_w) + dev_dbg(afe->dev, "%s(), no pinmux widget, please check if default on\n", __func__); + else + dapm_pinctrl_event(pin_w, NULL, SND_SOC_DAPM_PRE_PMU); + pm_runtime_get_sync(afe->dev); mt6359_mtkaif_calibration_enable(cmpnt_codec); @@ -403,6 +421,9 @@ static int mt8188_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) for (i = 0; i < MT8188_MTKAIF_MISO_NUM; i++) param->mtkaif_phase_cycle[i] = mtkaif_phase_cycle[i]; + if (pin_w) + dapm_pinctrl_event(pin_w, NULL, SND_SOC_DAPM_POST_PMD); + dev_dbg(afe->dev, "%s(), end, calibration ok %d\n", __func__, param->mtkaif_calibration_ok); -- 2.18.0