From patchwork Wed Dec 13 11:39:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Zhou X-Patchwork-Id: 13490794 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 618BDC4332F for ; Wed, 13 Dec 2023 11:40:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OQqe+M0SciQZs03dKyyk03FflXJC4UVH/RDIGAymDmI=; b=iJeCnSLw28TRTuoHxkEhlEEkrI Q7d/lukYNTifEnLOR7ots8NGK3xt7Fdt0CfQ943YhVZ/DsyftFjUYTGZt5qiYnKEF5WeVuCaId0CD vKERqdb+DCwo/0diaE/jX/uKfugl1F4LLyCfgts/zb/FczY7+E49ZuIAO18NPbMLHEDsd5IN5aeKC YQdjVNjJB3tzrU8Ft/AOzoIiswjYTBDd9ArMud0uegdn4i+AVl4EpZbzapFejZfTRSvldngNOT+VU EftKPoF14ZssR+cjWO/Uj00LsnhrKFhWHvsIJ//NPBBmHyHlfbPzqMlGeuxjrtx1o2/oaDmyoHs7O IpqzhTzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb4-00EV6H-0g; Wed, 13 Dec 2023 11:40:14 +0000 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb0-00EV3d-2t for linux-mediatek@lists.infradead.org; Wed, 13 Dec 2023 11:40:12 +0000 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-35d4e557c4bso30089995ab.0 for ; Wed, 13 Dec 2023 03:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20230601.gappssmtp.com; s=20230601; t=1702467607; x=1703072407; darn=lists.infradead.org; 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=OQqe+M0SciQZs03dKyyk03FflXJC4UVH/RDIGAymDmI=; b=EZPVXEtVjESI1wkgaJHWSTvoX3DrLMfXtx1rhK+3CMs9WAoD0hYFPky9OnvWeXnIeA or4PtWPFPLRSk8W5O0eOCMhFGQo/sRDTznqVgHAY9V/48NVCGigg9PyHbBjiAfZ5QezH L3YLzBOrT41ZsD+fBnLKHbOiz96Yim5GmWLyZ4od29gYNAR0X2nnhcXQiXrJaa97duPu rVtWuYpvASlm0ASEmmkYiU4+nJcY0IvbxqsL19aS3L7LzHdF4Tg2gHB+IQjeDwcIk23q gaL15OhLmXn6KlF/e61HrPXtqN8ychzo9x49+HNBbWsHQ94zVTxBl26Pwqu7hK1p67M9 3Jdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702467607; x=1703072407; 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=OQqe+M0SciQZs03dKyyk03FflXJC4UVH/RDIGAymDmI=; b=vje1eHjOI7i2lqilpa6ubkgrG6Rm4eguDC/7ZrPuYXs7ZPuNPDVvscNh7nTwjglTfQ uBRYM/4NQN8PvGqKVLERmqeLvsJPsMH9nHhF2iFNxPAh9kOl++YlQ427FcUUBgagcTI0 /jGjYrc7cis5hX/Pm1l+3vkKm/bbaRmewNCHE2rtjAsm+/tjoZlmfWG15a7WCQbqcpNy Pp1g6Rd+MW4PLq14zc3UnlHaMqIASZ5wU+8rym3415hicTtfccpmlrTS1dw/a9cBaibt C7KdvH1ql41rk51zDjOQ+Od2pbGdHJpITGscc2JuTNa/aWSAqALaTzI5u0o2e8yZtGkj UBOw== X-Gm-Message-State: AOJu0Yz5rPBj0kPb5upM/np/y6cAq0tzqTRc6NeoPkhBBFXwdGf/VRDg wS20kZwnZXhzvFhUjtESKDudqw== X-Google-Smtp-Source: AGHT+IGGyRqBeTDdNQ7HGycNQHOaojx3Dzjx01n/acJiFtPQlEWht8+O+/tfXna6+MHjMz8iHq9CZQ== X-Received: by 2002:a92:d150:0:b0:35d:6220:ac8b with SMTP id t16-20020a92d150000000b0035d6220ac8bmr8780918ilg.58.1702467607093; Wed, 13 Dec 2023 03:40:07 -0800 (PST) Received: from localhost.localdomain ([101.78.151.194]) by smtp.gmail.com with ESMTPSA id t1-20020a170902b20100b001bb9d6b1baasm10331066plr.198.2023.12.13.03.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:40:06 -0800 (PST) From: Rui Zhou To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, perex@perex.cz, tiwai@suse.com, trevor.wu@mediatek.com, allen-kh.cheng@mediatek.com, kuninori.morimoto.gx@renesas.com Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Rui Zhou , Conor Dooley Subject: [RESEND PATCH v9 1/4] ASoC: dt-bindings: mt8188-mt6359: add es8326 support Date: Wed, 13 Dec 2023 19:39:52 +0800 Message-Id: <20231213113955.47668-2-zhourui@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> References: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_034010_955464_847F6847 X-CRM114-Status: UNSURE ( 7.50 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Add compatible string "mediatek,mt8188-es8326" to support new board with es8326 codec. Acked-by: Conor Dooley Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Rui Zhou --- .../devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml b/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml index 4c8c95057ef7..f94ad0715e32 100644 --- a/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml +++ b/Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml @@ -15,6 +15,7 @@ allOf: properties: compatible: enum: + - mediatek,mt8188-es8326 - mediatek,mt8188-mt6359-evb - mediatek,mt8188-nau8825 - mediatek,mt8188-rt5682s From patchwork Wed Dec 13 11:39:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Zhou X-Patchwork-Id: 13490795 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 96931C4332F for ; Wed, 13 Dec 2023 11:40:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Lpd6C9NI3pbwTLe6pctih7tPOV6DJdooeIM997kH/ks=; b=0K8rAQ2hXD1aGVLCHSHHTSiYWs uvYdmMS96lXfkGyyAoFjvk3QI18RjKFUPMe6sLYiBCSepIMdejUut7lhyY1XSm2jfegKnoFftPBl1 YHpDsqThziie+VTC2QNgUlfP0YmBnuFEjVmc2isdUoU2aI8ykLUgNVoeoRqALYYUiNw2I+5sotzDv gXCQBNZvgJsNWesNY8vAgprbyiSLWWQNojReoyIM2Ksud65NHD+XXp9KT3OBWPCi2fI3drFn3shB+ YXT/LDRCsk+6GDBKxJn4hf5HpJ1U8UQBAnvx+4fpEpd+JocKWcEEV1+M2JxapQ0YYwhYfQTDBqQHj h4ixkIzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb9-00EV9H-1o; Wed, 13 Dec 2023 11:40:19 +0000 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb3-00EV57-0M for linux-mediatek@lists.infradead.org; Wed, 13 Dec 2023 11:40:14 +0000 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-35da160de2bso29091185ab.1 for ; Wed, 13 Dec 2023 03:40:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20230601.gappssmtp.com; s=20230601; t=1702467611; x=1703072411; darn=lists.infradead.org; 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=Lpd6C9NI3pbwTLe6pctih7tPOV6DJdooeIM997kH/ks=; b=FdnT7WzDSq17Zs+Eg8VtbSYRvO1T8ZZcErULotU24FkJ7OiRZiDKMcOuAr2TiJe1lN a/HmI18A5DDfYqsSdpUNpRt96XvpxRYyxcHltytxDxCDNUvuuD+6/621+6HL48QuSddv nYnvl095iHhvboOoPLZb7XJQ0WGlk60Mx/ey5Ao9Zmx+hjmsNSUFl+tw30S3jQEQhYWL IoyV5aYIQMOXb11wIJu9PKNL7T4JUUdyLDMevOHPATI9L6i+rARyoHZD4Kmayffd/fH7 Wr4FbQnrZh96tQ+FpvmjhK9jfjQdQwHSsSEoCxOk+NBGV7Mjx9R7HWhEusRgY0bP6yTV BePQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702467611; x=1703072411; 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=Lpd6C9NI3pbwTLe6pctih7tPOV6DJdooeIM997kH/ks=; b=tHqu/bLReA3dJd8GwGi6cx+FrMW1ze4W2bZBbUntuVkVoPUrxnS+9nOrGr0hwbFfi4 xpt0fuAQhPrmRRZqtYtHg+9rNwNILmz7pw8yQs93B+NYJneOSySWegIO6I2U+Se1jxji f/9fmmIwIBae7Th0PWkYBsBNRYx0rhA7mWza4k6/AXqQmeaun3+9InnWW0sAnx+cat2N gy3fzynY+1/S8DywJ/xenZgu5cv+lj3qstWG0o1vTtKYHJ8fFZi1u3eFoOkGmnNOqPFU kxdKvxWqHcOet5h7kQn36okkogZYgMGwfBu0pBGEu+qBL5mqWomwEuug7+3iJ0Rn5qgE jedA== X-Gm-Message-State: AOJu0YwhQtO5pfTQDwhfFn1Q7sc/NgnbaWanHg3wTFnRQIDhn06vA0Hg tlKGvgnxDtrA+PP44OYq1uXbrw== X-Google-Smtp-Source: AGHT+IGvmjF29b/0IjlOkfDCEspt2ZCEMxvOjfW1EgSB2aHQLbU0s6wyRZG0gia2QEjv69orKFbHTA== X-Received: by 2002:a05:6e02:20c5:b0:35d:693a:432a with SMTP id 5-20020a056e0220c500b0035d693a432amr12086058ilq.3.1702467611039; Wed, 13 Dec 2023 03:40:11 -0800 (PST) Received: from localhost.localdomain ([101.78.151.194]) by smtp.gmail.com with ESMTPSA id t1-20020a170902b20100b001bb9d6b1baasm10331066plr.198.2023.12.13.03.40.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:40:10 -0800 (PST) From: Rui Zhou To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, perex@perex.cz, tiwai@suse.com, trevor.wu@mediatek.com, allen-kh.cheng@mediatek.com, kuninori.morimoto.gx@renesas.com Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Rui Zhou Subject: [RESEND PATCH v9 2/4] ASoC: mediatek: mt8188-mt6359: commonize headset codec init/exit api Date: Wed, 13 Dec 2023 19:39:53 +0800 Message-Id: <20231213113955.47668-3-zhourui@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> References: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_034013_152033_EDE86F55 X-CRM114-Status: GOOD ( 10.31 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Reduce code duplication, unify the headset codec init/exit api. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Rui Zhou --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 67 ++--------------------- 1 file changed, 6 insertions(+), 61 deletions(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index 33d477cc2e54..b4606a28794c 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -726,7 +726,7 @@ static int mt8188_max98390_codec_init(struct snd_soc_pcm_runtime *rtd) return 0; } -static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) +static int mt8188_headset_codec_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card); @@ -775,68 +775,13 @@ static int mt8188_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd) return 0; }; -static int mt8188_rt5682s_codec_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_card *card = rtd->card; - struct mtk_soc_card_data *soc_card_data = snd_soc_card_get_drvdata(card); - struct mt8188_mt6359_priv *priv = soc_card_data->mach_priv; - struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; - struct snd_soc_jack *jack = &priv->headset_jack; - int ret; - - ret = snd_soc_dapm_new_controls(&card->dapm, mt8188_nau8825_widgets, - ARRAY_SIZE(mt8188_nau8825_widgets)); - if (ret) { - dev_err(rtd->dev, "unable to add rt5682s card widget, ret %d\n", ret); - return ret; - } - - ret = snd_soc_add_card_controls(card, mt8188_nau8825_controls, - ARRAY_SIZE(mt8188_nau8825_controls)); - if (ret) { - dev_err(rtd->dev, "unable to add rt5682s card controls, ret %d\n", ret); - return ret; - } - - ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_BTN_0 | - SND_JACK_BTN_1 | SND_JACK_BTN_2 | - SND_JACK_BTN_3, - jack, - nau8825_jack_pins, - ARRAY_SIZE(nau8825_jack_pins)); - if (ret) { - dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret); - return ret; - } - - snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); - snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); - snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - ret = snd_soc_component_set_jack(component, jack, NULL); - - if (ret) { - dev_err(rtd->dev, "Headset Jack call-back failed: %d\n", ret); - return ret; - } - - return 0; -}; - -static void mt8188_nau8825_codec_exit(struct snd_soc_pcm_runtime *rtd) +static void mt8188_headset_codec_exit(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; snd_soc_component_set_jack(component, NULL, NULL); } -static void mt8188_rt5682s_codec_exit(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; - - snd_soc_component_set_jack(component, NULL, NULL); -} static int mt8188_nau8825_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) @@ -1407,15 +1352,15 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) } else if (!strcmp(dai_link->codecs->dai_name, NAU8825_CODEC_DAI)) { dai_link->ops = &mt8188_nau8825_ops; if (!init_nau8825) { - dai_link->init = mt8188_nau8825_codec_init; - dai_link->exit = mt8188_nau8825_codec_exit; + dai_link->init = mt8188_headset_codec_init; + dai_link->exit = mt8188_headset_codec_exit; init_nau8825 = true; } } else if (!strcmp(dai_link->codecs->dai_name, RT5682S_CODEC_DAI)) { dai_link->ops = &mt8188_rt5682s_i2s_ops; if (!init_rt5682s) { - dai_link->init = mt8188_rt5682s_codec_init; - dai_link->exit = mt8188_rt5682s_codec_exit; + dai_link->init = mt8188_headset_codec_init; + dai_link->exit = mt8188_headset_codec_exit; init_rt5682s = true; } } else { From patchwork Wed Dec 13 11:39:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Zhou X-Patchwork-Id: 13490796 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0BA0CC4167D for ; Wed, 13 Dec 2023 11:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5MhKZsumq4MWT0PZMk1o4yZqjjymXBYPrRSLeOSmgoI=; b=DZ3ZnolEBM6vj4vkngrGi0405H TAvs1Oapc3d82cpQqC97VVOMIFdFCtQNoVuqFkSZ/nQbJFAO/P9pnbZEtnbllxCnOarLfG3N/5i/P fIg4cQyvkdjBsLMXTov8WmNGxmIBdhytQvTEXveth5Fp3dDSImI/ilpIbAuXTyklYirhxnzdVG8r6 z8m+1PPe+t94J0Trwll+uPlmmLzpgBpEhaXzpeDzqoqzeLTpH3rfFtVEk1jAaVHnXZd9sOVxd1xlU dLUt1V97xgipW8WnW3P7ublGTv4lWw4KT48ZAWLmAYmwmX6egTmAoT7tjzoA6lPI07IwumZc70BR4 i12JKgOg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb9-00EV9X-2u; Wed, 13 Dec 2023 11:40:19 +0000 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb5-00EV6r-1k for linux-mediatek@lists.infradead.org; Wed, 13 Dec 2023 11:40:17 +0000 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1d075392ff6so53631105ad.1 for ; Wed, 13 Dec 2023 03:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20230601.gappssmtp.com; s=20230601; t=1702467615; x=1703072415; darn=lists.infradead.org; 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=5MhKZsumq4MWT0PZMk1o4yZqjjymXBYPrRSLeOSmgoI=; b=jZew9MF5A21HfPWNVCpdeVIzgX4M8UrK//ZyHxLN7IvM25ov/5K3OSBQuLMgKZRrfG cWeV63ivafBz64Yyk5Ao4ByYXtrk616ic16tTavhPmFDnjVbjkKRRuv2trBlp9K4pqSn WjZd449aNdldUCnD3YBXZ7CYMZvhgKah2C7NJjCaQ9sZBb60ZdSkibVz1Hz5IgGLupkx IXkvplIlhPBU4pmv5ZeL0EjFIW8irYaKHVuODTer2gJnZne2QA1y3fLW5sNklyIF9wLh x54Kdjnva7GbGKiX5DDdgqLV8N5YtfodIY+G7xkRs+Azh+icHFV+md9vVOXz5ClHetox 7vwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702467615; x=1703072415; 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=5MhKZsumq4MWT0PZMk1o4yZqjjymXBYPrRSLeOSmgoI=; b=rsCQwOVarmDUqhN7HzRdpVSHFORRGe1YjdoQi65ZurueQ2v6ukS3YiUYKYWnUDBqB7 mvWEdPdDinztC7itRt5+i+sl+hwEsGEcxYCRX/73F1haOMWWPgZ2Thz0mYExdpfPtvy/ dyTSXODZHpMCNd8dWUjL3QUDO4y3XC/c5qFl1WQLk8DHvAEWDD7wwOzpX96KVOd+ykEq KnROyj+hBxOsQcBtszpU8elAftzax7wKoKjK0yK6WCCobcEK6so81t9NhzVVS/ZTCZdI VkEAAda8bBdU6m0q7Xl9FyBpHs+lCnzh4ZxV+hJwiRlgwCd7pvwSwmLvyeA4Aa3xVdeh C01Q== X-Gm-Message-State: AOJu0Yze01RDmcrAYuFSSX40talZIAH3NK/14DKLGWjahVgW8XIXwwOE YW5ij4MUzcG4sJNeLTeHZjqryA== X-Google-Smtp-Source: AGHT+IHPM0t2mzP01VO6cshlgighsDqYCmxGKn5nvhUslBUK1iGtE1r4KJF4obXaN6/7iR1x0S6uiA== X-Received: by 2002:a17:902:d48e:b0:1d3:5da4:68e7 with SMTP id c14-20020a170902d48e00b001d35da468e7mr88730plg.53.1702467614952; Wed, 13 Dec 2023 03:40:14 -0800 (PST) Received: from localhost.localdomain ([101.78.151.194]) by smtp.gmail.com with ESMTPSA id t1-20020a170902b20100b001bb9d6b1baasm10331066plr.198.2023.12.13.03.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:40:14 -0800 (PST) From: Rui Zhou To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, perex@perex.cz, tiwai@suse.com, trevor.wu@mediatek.com, allen-kh.cheng@mediatek.com, kuninori.morimoto.gx@renesas.com Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Rui Zhou Subject: [RESEND PATCH v9 3/4] ASoC: mediatek: mt8188-mt6359: add es8326 support Date: Wed, 13 Dec 2023 19:39:54 +0800 Message-Id: <20231213113955.47668-4-zhourui@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> References: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_034015_579503_1D141541 X-CRM114-Status: GOOD ( 21.90 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org To use ES8326 as the codec, add a new sound card named mt8186_es8326. Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Trevor Wu Signed-off-by: Rui Zhou --- sound/soc/mediatek/Kconfig | 1 + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 56 ++++++++++++++++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index b93d455744ab..296b434caf81 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -252,6 +252,7 @@ config SND_SOC_MT8188_MT6359 select SND_SOC_NAU8315 select SND_SOC_NAU8825 select SND_SOC_RT5682S + select SND_SOC_ES8326 help This adds support for ASoC machine driver for MediaTek MT8188 boards with the MT6359 and other I2S audio codecs. diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index b4606a28794c..d1884f23a1a7 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -34,6 +34,8 @@ #define NAU8825_HS_PRESENT BIT(0) #define RT5682S_HS_PRESENT BIT(1) +#define ES8326_HS_PRESENT BIT(2) +#define MAX98390_TWO_AMP BIT(3) /* * Maxim MAX98390 */ @@ -48,6 +50,11 @@ */ #define NAU8825_CODEC_DAI "nau8825-hifi" +/* + * ES8326 + */ +#define ES8326_CODEC_DAI "ES8326 HiFi" + #define SOF_DMA_DL2 "SOF_DMA_DL2" #define SOF_DMA_DL3 "SOF_DMA_DL3" #define SOF_DMA_UL4 "SOF_DMA_UL4" @@ -888,6 +895,30 @@ static const struct snd_soc_ops mt8188_sof_be_ops = { .hw_params = mt8188_sof_be_hw_params, }; +static int mt8188_es8326_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream); + struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = snd_soc_rtd_to_codec(rtd, 0); + unsigned int rate = params_rate(params); + int ret; + + /* Configure MCLK for codec */ + ret = snd_soc_dai_set_sysclk(codec_dai, 0, rate * 256, SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(codec_dai->dev, "can't set MCLK %d\n", ret); + return ret; + } + + /* Configure MCLK for cpu */ + return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 256, SND_SOC_CLOCK_OUT); +} + +static const struct snd_soc_ops mt8188_es8326_ops = { + .hw_params = mt8188_es8326_hw_params, +}; + static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = { /* FE */ [DAI_LINK_DL2_FE] = { @@ -1197,7 +1228,7 @@ static void mt8188_fixup_controls(struct snd_soc_card *card) struct mt8188_card_data *card_data = (struct mt8188_card_data *)priv->private_data; struct snd_kcontrol *kctl; - if (card_data->quirk & (NAU8825_HS_PRESENT | RT5682S_HS_PRESENT)) { + if (card_data->quirk & (NAU8825_HS_PRESENT | RT5682S_HS_PRESENT | ES8326_HS_PRESENT)) { struct snd_soc_dapm_widget *w, *next_w; for_each_card_widgets_safe(card, w, next_w) { @@ -1238,6 +1269,7 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) struct mt8188_card_data *card_data; struct snd_soc_dai_link *dai_link; bool init_mt6359 = false; + bool init_es8326 = false; bool init_nau8825 = false; bool init_rt5682s = false; bool init_max98390 = false; @@ -1344,7 +1376,14 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) strcmp(dai_link->name, "ETDM1_IN_BE") == 0 || strcmp(dai_link->name, "ETDM2_IN_BE") == 0) { if (!strcmp(dai_link->codecs->dai_name, MAX98390_CODEC_DAI)) { - dai_link->ops = &mt8188_max98390_ops; + /* + * The TDM protocol settings with fixed 4 slots are defined in + * mt8188_max98390_ops. Two amps is I2S mode, + * SOC and codec don't require TDM settings. + */ + if (!(card_data->quirk & MAX98390_TWO_AMP)) { + dai_link->ops = &mt8188_max98390_ops; + } if (!init_max98390) { dai_link->init = mt8188_max98390_codec_init; init_max98390 = true; @@ -1363,6 +1402,13 @@ static int mt8188_mt6359_dev_probe(struct platform_device *pdev) dai_link->exit = mt8188_headset_codec_exit; init_rt5682s = true; } + } else if (!strcmp(dai_link->codecs->dai_name, ES8326_CODEC_DAI)) { + dai_link->ops = &mt8188_es8326_ops; + if (!init_es8326) { + dai_link->init = mt8188_headset_codec_init; + dai_link->exit = mt8188_headset_codec_exit; + init_es8326 = true; + } } else { if (strcmp(dai_link->codecs->dai_name, "snd-soc-dummy-dai")) { if (!init_dumb) { @@ -1405,10 +1451,16 @@ static struct mt8188_card_data mt8188_rt5682s_card = { .quirk = RT5682S_HS_PRESENT, }; +static struct mt8188_card_data mt8188_es8326_card = { + .name = "mt8188_es8326", + .quirk = ES8326_HS_PRESENT | MAX98390_TWO_AMP, +}; + static const struct of_device_id mt8188_mt6359_dt_match[] = { { .compatible = "mediatek,mt8188-mt6359-evb", .data = &mt8188_evb_card, }, { .compatible = "mediatek,mt8188-nau8825", .data = &mt8188_nau8825_card, }, { .compatible = "mediatek,mt8188-rt5682s", .data = &mt8188_rt5682s_card, }, + { .compatible = "mediatek,mt8188-es8326", .data = &mt8188_es8326_card, }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, mt8188_mt6359_dt_match); From patchwork Wed Dec 13 11:39:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Zhou X-Patchwork-Id: 13490797 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 17F45C4332F for ; Wed, 13 Dec 2023 11:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pkeEHXB3/T/jnmWhl5vUXIuVy5c3DWow9x1MikiYeZc=; b=gCQvu2c8jD4KWGnywdiUdXPmaY MYst+zuG4zgz+rsfX+xH00msrX6jAmOQFuHKkdXd1KaN25zRZtF2B6we7rqAW4E4zT8+rl0qE2sez qxHEg+bMGpgzO+6AVxnp4+Xup4asYRSF0c8at74be5hdf5jlXtxoSDCkU+msTwUS/OXTa9Cd4AeSk CjkIKWu1fM7NRWvgELrovdBKz6inhPH0Rvx1Wx8hW2iVOpdqkZ8/CgGCZBUTexGR/5rCvgSX0rnmc yNZ8IZzHA6eVEuEZW4xRkVPm0QDimYsIsKa9YeHZDbZdmsFQNYATXeLpYUZdbKhbI/ncik1DCX6WV +p9rJaFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNbF-00EVCK-06; Wed, 13 Dec 2023 11:40:25 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNbB-00EV9B-2S for linux-mediatek@lists.infradead.org; Wed, 13 Dec 2023 11:40:23 +0000 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1d3470496e2so11210665ad.1 for ; Wed, 13 Dec 2023 03:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=huaqin-corp-partner-google-com.20230601.gappssmtp.com; s=20230601; t=1702467619; x=1703072419; darn=lists.infradead.org; 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=pkeEHXB3/T/jnmWhl5vUXIuVy5c3DWow9x1MikiYeZc=; b=GwjGheU6cJ5OOxiq7gIl66sXgrFCSya1euf++rQcwF5APIcN/qjJOKWYCzPJOj1vFL gEo4lRWGpCiTkt9lIc0K1r1xziQspX40eYnn7DRoT3y6m8xN2Lirrk1DECKkQmOemlxZ WYfqIGh2+JXtFQnzgvQ6sYNYSRD0EkQdqdQirsc9XXzWf+aIPrlYXM/H/8k2eX7X7U8F eeXcvbuhk516RLpHCwsglRI2W2RBZF5wTi9KM8wvpdy9JhPqXQw2GSw1yppXRwMmYjE0 tc/t53Jgi+VNPGpquRuY3RqE2uKFn+uKIXS2qSG8qT6/u03zgaD4a27rD5vbWFo/OlJZ gvHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702467619; x=1703072419; 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=pkeEHXB3/T/jnmWhl5vUXIuVy5c3DWow9x1MikiYeZc=; b=ny5umc8WDzPKcVWuOof/i6AuVFm3Vj8tbxBd0AGUXmJdF7TIUnOtEu2DlnADJKOivN KNaqjC6RtsELo83wy5dPeSE2e6yMyZWd0A7PYFkHy8W3EIm19wkoFq09XVZFhY3J5m6X bKTmVf1KEfZg9T9JD1RiYalhWufXQE8aug58bZkRw7SeFyXJ+VnnMBriowa/5wIx928v XgjHX2dQawOlDCCkVIzPpCeNCrXeWj9IFI/h1O4NIgyFGBKee0ZD6qxERrScF0i2tO2K dbKpm5Ta/nLaGPHECnIUdRKPSv8NNp0iioPhnfFXKidlwkAwNzSAv5OOdRE2KIrS/qLG cu9g== X-Gm-Message-State: AOJu0YztNAS0gM+gyOmTfYaXVcwEOSxstvQ3W4GZoey0Fn5hU8+dASGo NfuacG56kQWWrmE4f6gtN4Tyog== X-Google-Smtp-Source: AGHT+IEtRpE9piN/TcHjX3rZFm4N555Til6W/9RSMkR3uib8RAC7Oaqpe1Y4KsVWjCzLTxENloKduA== X-Received: by 2002:a17:902:8696:b0:1d0:6ffe:9f0 with SMTP id g22-20020a170902869600b001d06ffe09f0mr7464532plo.78.1702467618911; Wed, 13 Dec 2023 03:40:18 -0800 (PST) Received: from localhost.localdomain ([101.78.151.194]) by smtp.gmail.com with ESMTPSA id t1-20020a170902b20100b001bb9d6b1baasm10331066plr.198.2023.12.13.03.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 03:40:18 -0800 (PST) From: Rui Zhou To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, perex@perex.cz, tiwai@suse.com, trevor.wu@mediatek.com, allen-kh.cheng@mediatek.com, kuninori.morimoto.gx@renesas.com Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, Rui Zhou Subject: [RESEND PATCH v9 4/4] ASoC: mediatek: mt8188-mt6359: Enable dual amp for mt8188-rt5682s Date: Wed, 13 Dec 2023 19:39:55 +0800 Message-Id: <20231213113955.47668-5-zhourui@huaqin.corp-partner.google.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> References: <20231213113955.47668-1-zhourui@huaqin.corp-partner.google.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231213_034021_810856_5DE0130B X-CRM114-Status: GOOD ( 11.13 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org Enable support for dual MAX98390 amplifiers on the mt8188-rt5682s board. Reviewed-by: Trevor Wu Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Rui Zhou --- sound/soc/mediatek/mt8188/mt8188-mt6359.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index d1884f23a1a7..a391066ab204 100644 --- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c +++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c @@ -1448,7 +1448,7 @@ static struct mt8188_card_data mt8188_nau8825_card = { static struct mt8188_card_data mt8188_rt5682s_card = { .name = "mt8188_rt5682s", - .quirk = RT5682S_HS_PRESENT, + .quirk = RT5682S_HS_PRESENT | MAX98390_TWO_AMP, }; static struct mt8188_card_data mt8188_es8326_card = {