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: 13490799 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 A8EC0C4332F for ; Wed, 13 Dec 2023 11:40:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mxVdrIeFNVFht8JVSQBz1OJ3NNpZbFzWuZNCHuei9I4=; b=sOprd+Jn747PRO +O6uwQzsul9/rbNkgVdFWRf4rPX+FcS3LoPITgsIikX5yKzovCqDo6GuzUs/m4moo79T7c1SfRq5h dG/haygo/49ryt5gmldPnEnzKONPrpfufShEqQOFvVirsDz2jjtisyhUtmiOjruOHZDL492imV80T wK8Rk7fVu5+mCgqudPlnYd1B54x7PsZQxTYoEhCQ1d/9gfElR/HYjdy24bqeJEd+VK7HgS7WWyitc 7QgsjKnqLLs7etNlx4fRL3NrIDPRlznk7skhlCZPFbFx7rshmJF2905lD3pqtP2AUNQeMINpRSzO6 tGStfm7CKyjO0VC66ipg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb3-00EV5y-2L; Wed, 13 Dec 2023 11:40:13 +0000 Received: from mail-il1-x133.google.com ([2607:f8b0:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb0-00EV3e-1z for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 11:40:11 +0000 Received: by mail-il1-x133.google.com with SMTP id e9e14a558f8ab-35d725ac060so30053875ab.2 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=nCM8D/bxSa295dN8coKruyTkv9Fg830w7Hxu4He1AGgqEUfio9Z7+P2AP803auTidg 8ZMHNqhXDtsVCSvkGy40jfUZ1zJDIpjrVcH+FJnMqqKp+JRFz52yfZabNXWHW1+kAxkn 27aWH+iQLkL1YR+gLnkpdPBXMaFr0wjnHdHlO9bAEPd47oWP3VhD9TpZpHPlFdtBxVyl M4sIaSgdG1+Vc7kS2a6VolNUNTh7Ju5sQ/fv4toQoeN9EtD/WkRGejqezn+PLFsZrvgd NyhsIt6/ZzB2dxmp+63h5KI5iZhAmkw1PiVcsq1M+gyg4dS6weY9RO4esGgpO2bbyZ+l nN4Q== X-Gm-Message-State: AOJu0Ywb4XTgpDiIL9uoNLnDe1JJzwW2zWuFv8AxpyKRkswS01pmJSu9 ytNAnN4HtaVlZujtXW2mY+YbXw== 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_657351_FD29E4B9 X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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: 13490800 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 9AC3EC4332F for ; Wed, 13 Dec 2023 11:40:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KQ7sPu7efvhObXpWH8H0mFzSXePGz9YpkfsInUGToSc=; b=hHlDxR0V7l2bbs WTMv/d01YN1CMZCeaqXloFr8s/btiltajacX0njgdSxpDk50bLEwuffnRoDMyyR7J6HKdSf4U9ite AAkI2J/K32ISDy79oj8UzT1U/rflW5D5YuzvLMQTBPZYOJqRKAFEUc05gIMDxwXCdGSIf1A6P11m/ Ixxv+My1d0SidlerJwSUewE9c4EzxR4thMhaOF35YzWXAl91bG31exIj9lzyrXpuzFGxfCXPNgzF7 TJZKt8PMHwn7GkmH9G7r8Np39arRitJ8Zmr0dNrZENFhgTNtEaZZpoVvhj5ldswS6VR+W0xc30eZo YgpyM2ia0hp3PIDYKG4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb8-00EV8d-2a; Wed, 13 Dec 2023 11:40:18 +0000 Received: from mail-il1-x12b.google.com ([2607:f8b0:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb3-00EV58-0M for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 11:40:14 +0000 Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-35da160de2bso29091175ab.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=psLMp2SoiN2DJpuUfD1FmzbvkeEbR+m9Sjr5Ecttc+jX5Tl7qoDiDkd6iT8JJlKtGD 3jkRnR9GuI0aAoTLAtifUugSzQb9wFnb5p/wUfN7rPAnFtT1C7+6QGUzyruC+/Vo9jIu XT6U3WPutQUz7nx72lv0NE7P3Vd4fqCD9KVGV7trYaF4U6ZZYWNQPFvlBbKOv58ZnD+6 8gsunWvVluH0LaNszu4Ov8UG6I3q8KKKiYA6QR/vdXzBwEv4zpm2exJ98ZGKbLbG5yb6 1jMM0sGPpfMvS7ksHOQKHn25OPmz8EuBJYl2nsSGdX+WcGjSkw6sRlaf8w2nZxyCq3iV Txcw== X-Gm-Message-State: AOJu0YwxjbMlNtZdBSB7Cz+MP8dK7gKVJg+6n5dzkQLIhq4PRijapT6e LIfmSwti+lqqKKmjMxqpQOcIeA== 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_152246_0AB915CC X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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: 13490801 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 0C177C4332F for ; Wed, 13 Dec 2023 11:40:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=GMA5qcQhDDdapM8XSqFY2m+mkIklVtH0/jGqy56Eq1Y=; b=J6xzDka4AXAsLb ynYIqY171qo8YzkDRb+1wZAjl4NYdVJPq28XuA6mjjwJCAfA6q9/ZmV3nL1B1uRKpayRarCCrdSeJ 38VAvAxDiuZhu0a4T8uLk+3vYA1d303IkF8bf1o2KgZEFjF/NhRyHyKIXOaUpLWvujl9qbN0NTi25 bju3hsvdoouYGclRNk4AFgamJFIsNI6hH7vrRFTA4MDbQB9YE4WJlbIRzalJYc8XCXfRrIE0IeEiQ 3vwZEwPyma/C83oWOY/ar07IAyK9UM1UZJ9HQTOtejeirOTJkzEPZzosh0RMOD2hPAObEAfmJxRko ApVkvdU9BKFHDP6r1hUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNbE-00EVBs-1T; Wed, 13 Dec 2023 11:40:24 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNb5-00EV6s-1s for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 11:40:18 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-1d075392ff6so53631115ad.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=a/nn+CzjOckm2sU9VITgnGN/k3Vo12mwVv2hyGdjC5BntsMvo3LQ5LLCfhzd2F9GRn NxSrueHcvPj1zIAiALuFrjDyX8B8Tid/xMvDUK/9AsEfhremZ6P8iD8IWU6WMPpkfM7o y5YxPq8di8CixequyRXlmxHZ04rmFBGS/syVJD+Y6mpc6JVfte2JOTtjD6f8hswsLvnC W3xNFZQJHAzq539y4Mc0ETcs0By3MotuTYH/KNhb52nXxRYcgtTv+heGF+myCbr3ggRz j4Ahz+0bvE9qnWZfKDA/Bu+bbCAhhEDEh7v/BU9tWdG3qKLDN5FaRWp+oY1v27TpUgyC PJeA== X-Gm-Message-State: AOJu0Yy0IGQKmqjBpVNyZBtAVa9kDIimNBaYbdHreyzi6aET8LUmTJ8j Khr+MheonuVMqbUHmlDaDW0G8g== 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_637026_9F6651D9 X-CRM114-Status: GOOD ( 23.20 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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: 13490802 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 69500C4332F for ; Wed, 13 Dec 2023 11:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6x10Ohps6Jn8tYBDmnyRoGS0fcFoZ59cwjiJeloDolE=; b=O11/A9YJx5nJBW 0foIf20B7myE+Gl1UW6Oq7KdPLaALTjYnW0x0YkQ6lBZOEsL7bFr8+hPpsR7irI+pRQDdOyA1XwrR NI9T+vD7l9aVqLHdJmT3zG1Nj7ZjrlgzfKga13pUwPEGxOfwpjL9DCUK5Zodu5xB/3zBpuvTxfY9V 4IoJcbAO8X4oxx0JGgfFA1pzh4mC6JyqJa9Etpr4+VxprJ7HX/7efBP629fjXyxsSPYjYTQ6+yUhg GoPitrPRypBwWB4owtI2Yg8rrR7REpSksnVRqVOttHbm0uoC7Qskky2NaQgt9gxAsIDskqYfDFR1+ Pah7/jGmbtynUOUEBVCw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDNbI-00EVEB-1e; Wed, 13 Dec 2023 11:40:28 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDNbB-00EV9C-2S for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2023 11:40:23 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1d336760e72so16236085ad.3 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=hS5xQ7JTsIDLiFgewdq0aonJ2rgplrmvp/9/I3LB2GpRZRnQcC1ECWGH5IFwTHwIUX KloPZtYRNf7FPogyAK8Hbasq7tC3/RP4U8d/eCbTJ56uTstSZ3MhdHWfcu4rKHCCYG7B wG8BKJrQ2DiiPYXcaF6/5gfcSb13i0Cotl2WqctwZ6dKiGuYuZ+Lw8JTZlpFfacZJF8v /Eu1SCJsErcL7+vknOA3cxMTpqnchafUfT9i9DTn0dUHl3ZdinDAVqtoG4vuarAx7H4c 61sFzEYmcUaKNpZTff9Z9Spvd96bd1eJDjTqS0N+YB3ZZ2Q368ozAMXoDss0ku9n6ivU IDPg== X-Gm-Message-State: AOJu0YzyrIhM3Tl3SXkrl1pHERGDTTFoY0qoJtsTiNper50TNGB3si7K l95P6/lGxcbb0kZPut94KSqY5A== 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_826102_61999A3F X-CRM114-Status: GOOD ( 12.53 ) X-BeenThere: linux-arm-kernel@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-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=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 = {