From patchwork Thu Apr 17 08:44:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Massot X-Patchwork-Id: 14055128 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 2E909C369B2 for ; Thu, 17 Apr 2025 08:57:16 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8fxziHulNjE4YZN7A3123UDCbQScsXOmC7twyXSuCh0=; b=CumWwq51gspJzM7fs75pPatjRX zMIBvHeyeHTg8H5YHsSEAuaGHBcuaZorvXhvprgTGT6E6Cv/wT1cKzUHSs6zud54uKlN3yUEnn3p2 3M9yf2rYi0FpmBI9zCrfggTpNdbm1kM8js3CGMt8lf2p85Rjr/wtj6JCQbCdK+rSuoPinIZP45xih 10TEhOd4CgK2vIFUaqMuaIn8QCgPxvDKRBCR/7Npib2LvG5v8piaZnrYdHJKimKThXwipD1wT1qxk eC82335658HLISy9Lz+xL0C9MBk7WXo3hrZxcO8PX8310ZK4OSHfBeCzfEXP8qMW8SYhrSrm+qnlH T/ZzXZUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5L3Q-0000000CLyB-0sfT; Thu, 17 Apr 2025 08:57:04 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5KrO-0000000CJdy-0zUA; Thu, 17 Apr 2025 08:44:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879476; bh=rqpmpGxXSGELcHRBTPCV1yQQmzMmHIT+7KC+3I/Dg/E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=g0DZUto7oinMejVddqxdiSlIz8jM0b6HaiX7wY4U5JyCrtSl41eiPvibCv0HwHc3W Mv/j1k5NtEpz+lmQJYfdvRsLOzeuAUdFG0I5xJkt7jFpNpT0fZGqrvbrCwXv18Aurr CnAGxzJkvASl95Y7sxujh5K8SMBgclJAxYhsgtcvoqat2cxclo4aC/5E7uEi0EjBfK LoS3z6AVSVqRSWikAYUUlksMFUQ/XwD/W4ItD4wyYCE0g3GXmkFYqWnVmk1vKV+yhQ pS6WL60kOwdDrXk+kXncNkqlwh5q24OnB2kNOO6djkvFUdLUvYLJu/CtHPEheMwHHo pS6lUfnwkwsZg== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 992CF17E10F7; Thu, 17 Apr 2025 10:44:35 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:32 +0200 Subject: [PATCH 1/6] ASoC: mediatek: mt8195: Move rt5682 specific dapm routes MIME-Version: 1.0 Message-Id: <20250417-mt8395-audio-sof-v1-1-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_014438_427512_32A1C9D4 X-CRM114-Status: GOOD ( 13.05 ) 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 'HPOL', 'HPOR', and 'Headset Mic' are rt5682 specific, move these routes to mt8195_rt5682_init so we keep 'mt8195_rt5682_routes' for connection between mt8195 and mt6359. Signed-off-by: Julien Massot Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index df29a9fa5aee5b6aedf34972cdf53402366d2ac2..f0bb59cf581b1e3bcfa66406d31de446a917c6c6 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -92,10 +92,6 @@ static const struct snd_soc_dapm_widget mt8195_mt6359_widgets[] = { }; static const struct snd_soc_dapm_route mt8195_mt6359_routes[] = { - /* headset */ - { "Headphone", NULL, "HPOL" }, - { "Headphone", NULL, "HPOR" }, - { "IN1P", NULL, "Headset Mic" }, /* SOF Uplink */ {SOF_DMA_UL4, NULL, "O034"}, {SOF_DMA_UL4, NULL, "O035"}, @@ -131,6 +127,13 @@ static const struct snd_kcontrol_new mt8195_speaker_controls[] = { SOC_DAPM_PIN_SWITCH("Ext Spk"), }; +static const struct snd_soc_dapm_route mt8195_rt5682_routes[] = { + /* headset */ + { "Headphone", NULL, "HPOL" }, + { "Headphone", NULL, "HPOR" }, + { "IN1P", NULL, "Headset Mic" }, +}; + static const struct snd_soc_dapm_route mt8195_rt1011_routes[] = { { "Left Spk", NULL, "Left SPO" }, { "Right Spk", NULL, "Right SPO" }, @@ -447,6 +450,7 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); struct mt8195_afe_private *afe_priv = afe->platform_priv; + struct snd_soc_card *card = rtd->card; int ret; priv->i2so1_mclk = afe_priv->clk[MT8195_CLK_TOP_APLL12_DIV2]; @@ -473,7 +477,12 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) return ret; } - return 0; + ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_rt5682_routes, + ARRAY_SIZE(mt8195_rt5682_routes)); + if (ret) + dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret); + + return ret; }; static int mt8195_rt1011_etdm_hw_params(struct snd_pcm_substream *substream, From patchwork Thu Apr 17 08:44:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Massot X-Patchwork-Id: 14055135 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 733A7C369B2 for ; Thu, 17 Apr 2025 08:59:08 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8DjqrF0UVfeTYo4Q4WizwcC9iOpvJXCioJAuxj2xk0E=; b=ZGSq2sYpye9aAgxXISg+Ej4vTn 9GZQbviUgFptqhDTfUwGMogjlX45yQcASFSRveP8/7slRWSAziTsTPlz1pz3rLIe6fQS+QbpSwxgb aaAINGn2hLUr1AQmMNPu/+GAsZ00NQG8E+iI1ZwGROQTBAMnbGdYxARx5dJurLQDzMc1/x+q2so5X RjRWvsFa+ZHo7/zr28lbi/a+Nv4vl9yzzWz0hkAe7brOa5dgOEf5oDwx0JQD8s7DrhSBRsH0Xd1aA Q8aRweuYwyaO5qHhclTlxhZRdsD5pV3WoObQpAFa32sKbZnwOvg1Xo6+rru7St3S4Rz/A5k/rTfmj V2XDty8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5L5E-0000000CMII-2IhN; Thu, 17 Apr 2025 08:58:56 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5KrP-0000000CJe1-0fH7; Thu, 17 Apr 2025 08:44:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879477; bh=PZhraFVEqkkbwU0S7ke2vhkoESu/QbDsvHZPg8LdjGw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Bht7BhzXNlLeIdHemSTFDtvGeSK4MFObW1n+Fw+uPUMRwBT+ngPr1KeC7xyiZDyF8 5R6+qDF1px5gfPv4sIR9AWGqSoWoD97I6D6KUwp1Z7CmZGyi0xxw1Id1v0HDNxx+9E 2dFxzx9SrZ7fjDAYJbsUksCVXNZbnrKYGANAHX7hVnWA+MFtawj8o2UoQTw5+e0VET PrUxrERcCUUP4Gr6lz7nqDxjs+HaOoyyKcWJV6EBbBBqOS4N1hD7l4ZHUXM2QHALXw cXMp0ncN10VtrUAz9bh2xRDnqpGYAdVXn8OtwRSVpZWsgDR1NZsRt6aAn7mnXhlBfG /Z5kS+pegBvZg== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 8475717E153D; Thu, 17 Apr 2025 10:44:36 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:33 +0200 Subject: [PATCH 2/6] ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY() MIME-Version: 1.0 Message-Id: <20250417-mt8395-audio-sof-v1-2-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_014439_385709_E7F82325 X-CRM114-Status: GOOD ( 11.72 ) 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 ETDM2_IN_BE and ETDM1_OUT_BE are defined as COMP_EMPTY(), in the case the codec dai_name will be null. Avoid a crash if the device tree is not assigning a codec to these links. [ 1.179936] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000 [ 1.181065] Mem abort info: [ 1.181420] ESR = 0x0000000096000004 [ 1.181892] EC = 0x25: DABT (current EL), IL = 32 bits [ 1.182576] SET = 0, FnV = 0 [ 1.182964] EA = 0, S1PTW = 0 [ 1.183367] FSC = 0x04: level 0 translation fault [ 1.183983] Data abort info: [ 1.184406] ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000 [ 1.185097] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 1.185766] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 1.186439] [0000000000000000] user address but active_mm is swapper [ 1.187239] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP [ 1.188029] Modules linked in: [ 1.188420] CPU: 7 UID: 0 PID: 70 Comm: kworker/u32:1 Not tainted 6.14.0-rc4-next-20250226+ #85 [ 1.189515] Hardware name: Radxa NIO 12L (DT) [ 1.190065] Workqueue: events_unbound deferred_probe_work_func [ 1.190808] pstate: 40400009 (nZcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 1.191683] pc : __pi_strcmp+0x24/0x140 [ 1.192170] lr : mt8195_mt6359_soc_card_probe+0x224/0x7b0 [ 1.192854] sp : ffff800083473970 [ 1.193271] x29: ffff800083473a10 x28: 0000000000001008 x27: 0000000000000002 [ 1.194168] x26: ffff800082408960 x25: ffff800082417db0 x24: ffff800082417d88 [ 1.195065] x23: 000000000000001e x22: ffff800082dbf480 x21: ffff800082dc07b8 [ 1.195961] x20: 0000000000000000 x19: 0000000000000013 x18: 00000000ffffffff [ 1.196858] x17: 000000040044ffff x16: 005000f2b5503510 x15: 0000000000000006 [ 1.197755] x14: ffff800082407af0 x13: 6e6f69737265766e x12: 692d6b636f6c6374 [ 1.198651] x11: 0000000000000002 x10: ffff80008240b920 x9 : 0000000000000018 [ 1.199547] x8 : 0101010101010101 x7 : 0000000000000000 x6 : 0000000000000000 [ 1.200443] x5 : 0000000000000000 x4 : 8080808080000000 x3 : 303933383978616d [ 1.201339] x2 : 0000000000000000 x1 : ffff80008240b920 x0 : 0000000000000000 [ 1.202236] Call trace: [ 1.202545] __pi_strcmp+0x24/0x140 (P) [ 1.203029] mtk_soundcard_common_probe+0x3bc/0x5b8 [ 1.203644] platform_probe+0x70/0xe8 [ 1.204106] really_probe+0xc8/0x3a0 [ 1.204556] __driver_probe_device+0x84/0x160 [ 1.205104] driver_probe_device+0x44/0x130 [ 1.205630] __device_attach_driver+0xc4/0x170 [ 1.206189] bus_for_each_drv+0x8c/0xf8 [ 1.206672] __device_attach+0xa8/0x1c8 [ 1.207155] device_initial_probe+0x1c/0x30 [ 1.207681] bus_probe_device+0xb0/0xc0 [ 1.208165] deferred_probe_work_func+0xa4/0x100 [ 1.208747] process_one_work+0x158/0x3e0 [ 1.209254] worker_thread+0x2c4/0x3e8 [ 1.209727] kthread+0x134/0x1f0 [ 1.210136] ret_from_fork+0x10/0x20 [ 1.210589] Code: 54000401 b50002c6 d503201f f86a6803 (f8408402) [ 1.211355] ---[ end trace 0000000000000000 ]--- Signed-off-by: Julien Massot Fixes: e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link") Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index f0bb59cf581b1e3bcfa66406d31de446a917c6c6..a370b8af8c282bbcafce82561312e24c515beea5 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -831,12 +831,12 @@ SND_SOC_DAILINK_DEFS(ETDM1_IN_BE, SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_IN")), - DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), - DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE, From patchwork Thu Apr 17 08:44:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Massot X-Patchwork-Id: 14055136 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 52C1FC369B2 for ; Thu, 17 Apr 2025 09:00:59 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9lO6c9ZhHYvjwD6xvNFgLjCMDSCngrVXyFTwEON+ZDg=; b=rOUyS7QrAZOtncak/yTeZZozjg FxCEBMH1cF7VBXTmzlJMAESfc3xwJTySJ1BjoUvXhhvye097sbX86ACKRIczFb2f1MRH4OM2T+N3/ y6GoNs1CeTYkQqfDlWafpXd/raVzDisfN6bGhZj0nHPj4pS9ugfvLsy3JN9lsDn+nbg/Mcusz1fXW MIYv9ud30EHjwBb0NFBC2OegiFBcEgfER1xodBqzzpEJ3pV3b69l0Q8FQ51S+QBM9J63aRkW0tiG/ V1j2YXDQ4uTlbrsN5xJ2/tzGXbIvsw1fDNStgGISfivKA4oozKAn0jgLd2ZmMajW6aCYCQpnRyaTj J2Qe7Ypw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5L73-0000000CMaO-2Wub; Thu, 17 Apr 2025 09:00:49 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5KrP-0000000CJeV-2Ms6; Thu, 17 Apr 2025 08:44:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879478; bh=i22aKPunjfXrA9afWCfJfAgh+B/tbdFUIUcF/NQsLWA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SR0WTokFZY9+TbZfvQZfA/VvaXtct3qWXxo45Q8Qt3WoG7O3Af+qtIrXo4JACKE7I bzyquzk/Al2CSCtR1Tvx2zO8bJl1f3oLvYx0m765Dbe6K+5iMQkRiSmKj9MrkZKx8A mnU7WGfIgmnlwHUpClIqTZBjwLkvT7xpBmtNWKDUcIItzSU3GZFE/ZpdzIc4jN4tzT n28fWAyqWF+iQs+8Xkc+29IQDSjBGHwcVGvrDoBTqaueWrO04iQFlRzy5mmWYJF6um 90UgiJfZ1LB3lDiVroB9bxuz7u7/lrtmecK/6XtXJs2mkokX1ZvtCS1O+rS4+bgIL7 SzlPE0eliuyhw== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 6B05117E3634; Thu, 17 Apr 2025 10:44:37 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:34 +0200 Subject: [PATCH 3/6] ASoC: mediatek: mt8195: Add mt8195-mt6359 card MIME-Version: 1.0 Message-Id: <20250417-mt8395-audio-sof-v1-3-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_014439_777026_15376800 X-CRM114-Status: GOOD ( 10.16 ) 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 Other mt8195-mt6359 cards rely on external codecs, add a card for board that only use the mt6359 codec. Signed-off-by: Julien Massot Reviewed-by: AngeloGioacchino Del Regno --- sound/soc/mediatek/mt8195/mt8195-mt6359.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c index a370b8af8c282bbcafce82561312e24c515beea5..3115a098e22e53345adfa4a36a1a72ac5a16164d 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c @@ -1524,6 +1524,18 @@ static const struct mtk_soundcard_pdata mt8195_mt6359_max98390_rt5682_card = { .soc_probe = mt8195_mt6359_soc_card_probe }; +static const struct mtk_soundcard_pdata mt8195_mt6359_card = { + .card_name = "mt8195_mt6359", + .card_data = &(struct mtk_platform_card_data) { + .card = &mt8195_mt6359_soc_card, + .num_jacks = MT8195_JACK_MAX, + .pcm_constraints = mt8195_pcm_constraints, + .num_pcm_constraints = ARRAY_SIZE(mt8195_pcm_constraints), + }, + .sof_priv = &mt8195_sof_priv, + .soc_probe = mt8195_mt6359_soc_card_probe +}; + static const struct of_device_id mt8195_mt6359_dt_match[] = { { .compatible = "mediatek,mt8195_mt6359_rt1019_rt5682", @@ -1537,6 +1549,10 @@ static const struct of_device_id mt8195_mt6359_dt_match[] = { .compatible = "mediatek,mt8195_mt6359_max98390_rt5682", .data = &mt8195_mt6359_max98390_rt5682_card, }, + { + .compatible = "mediatek,mt8195_mt6359", + .data = &mt8195_mt6359_card, + }, {}, }; MODULE_DEVICE_TABLE(of, mt8195_mt6359_dt_match); From patchwork Thu Apr 17 08:44:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Massot X-Patchwork-Id: 14055141 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 E3312C369C7 for ; Thu, 17 Apr 2025 09:02:53 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EPgNR/sROm7jzLt2t97F0yxCCTK9RqgvE4VhwkRebxU=; b=UI5QgydTNBW2/f2M//eSHhn8ei Qrj1Qr++9dJVZYv1q3kEr4AbHAgZZWVVakecApebNWKgpHWte4s0xPpZQbNefALsko0MkDAWmHuVV Kd/hKIqVnYkwZXdXrnJfFbqpjfVH9L+l2pGgwV7dHOpsdkUsTPUQE6Qarsw7FL9AH5AKxSPzetxWN s90u5d+6pSrLvpbhyicIsygWW6V9AkkoQkfBISybHnVkZllsceopRfI2n5vDXkgbQsgaszDmYijz2 2iLAzNJWRkRpYWq0n2Qxp5qA3OPkJZl5+U8fzSk2E5BbFh/pF0l3N+CyLIOroXZ0V5KQmlC5LeH+O V/N9KHxA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5L8s-0000000CMtJ-2NcB; Thu, 17 Apr 2025 09:02:42 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5KrQ-0000000CJfN-1YB5; Thu, 17 Apr 2025 08:44:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879479; bh=v23JT6QPcdjNmOFZ+Icy4Oan4WiHogN5p2dur86WsSA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BL5osxyyEoLBP8cwkPBkXrJiPkOMmvBPBis+4m/ayWLf7ukS72qW13VjcTDNm2RML NCdkhRCeDTs2Vg1xTSjwRf9qxHzC8B4ruxLjyomsDZOG4w/dCjTHkY8OeHs6KT61cQ sxzTlzzoi+bJxMwX4ydRDPQwNHbWO8VqCqwQLPnqg62xuDtEq7sc5IpNPG+1DljEZE 9av9S+AmDz+Z0ijadnhHtkOuxBtbuWJyh0nqXu+Wgi4si1apFdkp9ztvYoA4sOltEa 5J8dswTjqgxSHrniZ1rGfPNhsI4U87qX2SatELJBTIyrm0WOlUMYxOSzTwiX9xDjbD MgxsrhwmAKuNw== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 53D3C17E3654; Thu, 17 Apr 2025 10:44:38 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:35 +0200 Subject: [PATCH 4/6] ASoC: dt-bindings: mt8195: add compatible mt8195_mt6359 MIME-Version: 1.0 Message-Id: <20250417-mt8395-audio-sof-v1-4-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_014440_556072_CA189B3F X-CRM114-Status: UNSURE ( 7.94 ) 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 Make it also compatible for platform without external codecs. Signed-off-by: Julien Massot Reviewed-by: AngeloGioacchino Del Regno --- Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml index 2af1d8ffbd8b58f1dce42b369fd699795183a7d7..54a53d15f40c0af56a2a0221025f3a090a05b6e6 100644 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml +++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml @@ -21,6 +21,7 @@ properties: - mediatek,mt8195_mt6359_rt1019_rt5682 - mediatek,mt8195_mt6359_rt1011_rt5682 - mediatek,mt8195_mt6359_max98390_rt5682 + - mediatek,mt8195_mt6359 model: $ref: /schemas/types.yaml#/definitions/string From patchwork Thu Apr 17 08:44:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Massot X-Patchwork-Id: 14055142 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 F365BC369B2 for ; Thu, 17 Apr 2025 09:04:44 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=uIRHt+csoMqqeeEh6CcdY7U6w8VlXpY+igi1y40Z2eM=; b=OmqoKKb5N7nBaQRMXi0D0xQPV5 YD3vuu00uSDaBwYPDePGxwxajx43hpdeyJTfTVzejSqK3UUAuYdUQ0+RUzVwCnQA/uG5XROHQ8FYD 5Ze/sWixDZl17fj860ATfzL48/ff3ya6rglTrwofAU23yINVBamLeF3q3ksdGTih/ayEgdouN9Pfw Rs4zWxmRD2Z60YhFIIpMXXZPudoIXwVnDvWrLfdPJ1tLrvWkL8yI8lJKuyK3nQT1ATHhsN+EoqcV2 h7UKY4OJUrduBSkudVyRlDhG8YFeta8hTqSy+E8Kelm65oEkOCG4gk0bMXQ4j/LdYw7h1Rv8zTHMX H3OeiKsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5LAh-0000000CNK5-2ffr; Thu, 17 Apr 2025 09:04:35 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5KrR-0000000CJfx-1EbE; Thu, 17 Apr 2025 08:44:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879480; bh=yYuncH4o/OXu+LBXvJQSH5seIVPQe5LqP78BPBexpWU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bQ9G7o1O5KE5HrcB3TN3qvG0lAcYgiwSq8nLNUDwggbHNXkUEm/vJp5dWR7P5Ddo0 zZu9yVmDkMG5hH1Tw/R6gRFTl1rXZbaYVcVL6T80bHpnklT/4vLJY6vGwcdHF2ZU0W 5ZeQX5xatb6jSWo05Ymc6or10ioYQh+N4gTa9B4IngYp0l2m50GX32OQvrdPlnQ87q 21cb2xNifROdMdwFQPnvAGBeTyl3s0qrmfKzog+TvMCs1F5Nurtn+/d7svQ4lNXGEw +RzEnVvlGCc3/CQmPaJvsUeSIZvBX90+U/CjOWDXmJRrGyNB9dZvioPrPnffc22Kaz W/wfu2stcKu/w== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 3E19817E3655; Thu, 17 Apr 2025 10:44:39 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:36 +0200 Subject: [PATCH 5/6] ASoC: dt-bindings: mt8195: add missing audio routing and link-name MIME-Version: 1.0 Message-Id: <20250417-mt8395-audio-sof-v1-5-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_014441_477753_AFF00B54 X-CRM114-Status: UNSURE ( 7.87 ) 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 missing DL_SRC_BE link,as well as Headphone L/R that are provided by mt6359. Signed-off-by: Julien Massot Reviewed-by: AngeloGioacchino Del Regno --- Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml index 54a53d15f40c0af56a2a0221025f3a090a05b6e6..356e1feee9620981aadbf91115af1d67a735bb2c 100644 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml +++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml @@ -45,6 +45,8 @@ properties: - Right Spk # Sources + - Headphone L + - Headphone R - Headset Mic - HPOL - HPOR @@ -89,6 +91,7 @@ patternProperties: link-name: description: Indicates dai-link name and PCM stream name enum: + - DL_SRC_BE - DPTX_BE - ETDM1_IN_BE - ETDM2_IN_BE From patchwork Thu Apr 17 08:44:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Massot X-Patchwork-Id: 14055143 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 DA305C369C7 for ; Thu, 17 Apr 2025 09:06:40 +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:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kK++4KEjopzd3vOO1qiwbVaUdMG+Eelxb/pNE2LdhjI=; b=Kko1txn/7HAdcgAu92bcN/AygR 4a7Zdvklu31SbFDwCR+sBim48gfCLJzWnh+ukDsnPJndqjtzQ9VugCxZQM3q1mY8kWToYBLzVQX74 eC7OHGiKezhJF5SCGXtxNq7tJeopKJtc6QkbF2YCsB7Zm+DFSnGETTdSr6PCzzHOWhQUgC6i1AMRk POVz9H9tMQQnpeENKW+fO2CiirLSMYy42JiJzjPof5X8gmUl2Xhr782+BhC8rqSgUujeHUDza39kr QJGfaBYKrtWMqAotHjau68hm92A7jJKMrCPVfAR/iIz7Pk0GWVbBhBybVRfLzZsIgMEHQZ8189RaI tU46wG7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5LCW-0000000CNlU-307n; Thu, 17 Apr 2025 09:06:28 +0000 Received: from bali.collaboradmins.com ([148.251.105.195]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5KrS-0000000CJgQ-0zh2; Thu, 17 Apr 2025 08:44:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1744879480; bh=VVe96Sxh4UjB+6wWfJmCsejUrl/4lubhEpkWMcF5TxE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=h2covrb2IhbfW59GvSoOFxkmnZvmdOyCqEgVB9EilghDYKRaF9/4A3wHrTKFTjdnS B4I3PWS+mVqD3po1lpLjwK1SpnHUsv2/vffyylgdncBUOTmh4NQMjDY8piZjpVVP5u WsdDwvvamTaYvMdYCAj+pobs6txy8rtoEcjDDR+HzVDXE7TrAjCfTDVIlm1FKAj9HT L7s1ydd+r7hnISFYwSJMHQCuM6puGXZ7KZmRp3IT1R8+SjaX51mRqgIOQQ5TX5i1HC wbOy85UgIWEGRa6D23OMqjYO7G0L/4Yn6amGpHzRvjUDUX/T1smeo4Z1IInRpfy8bg SadijCsK+DJNQ== Received: from apertis-1.home (2a01cb0892F2d600c8f85Cf092d4af51.ipv6.abo.wanadoo.fr [IPv6:2a01:cb08:92f2:d600:c8f8:5cf0:92d4:af51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: jmassot) by bali.collaboradmins.com (Postfix) with ESMTPSA id 26F0B17E0FA7; Thu, 17 Apr 2025 10:44:40 +0200 (CEST) From: Julien Massot Date: Thu, 17 Apr 2025 10:44:37 +0200 Subject: [PATCH 6/6] mt8395-radxa-nio-12l: Add sound node for headphone MIME-Version: 1.0 Message-Id: <20250417-mt8395-audio-sof-v1-6-30587426e5dd@collabora.com> References: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> In-Reply-To: <20250417-mt8395-audio-sof-v1-0-30587426e5dd@collabora.com> To: kernel@collabora.com, Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Trevor Wu Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, Julien Massot X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_014442_422585_A555597F X-CRM114-Status: GOOD ( 11.17 ) 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 memory-region based on mt8390-genio-common - Enable adsp node - Enable afe node - Declare the required pins - Add sound node for headphone output routing Signed-off-by: Julien Massot --- .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 58 +++++++++++++++++++++- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts index f2eb1b683eb76f783f5a13f28a78f6e33238b5f0..329c60cc6a6be0b4be8c0b8bb033b32d35302804 100644 --- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts +++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts @@ -139,9 +139,21 @@ bl31_secmon_mem: memory@54600000 { no-map; }; - afe_mem: memory@60000000 { + adsp_mem: memory@60000000 { compatible = "shared-dma-pool"; - reg = <0 0x60000000 0 0x1100000>; + reg = <0 0x60000000 0 0xf00000>; + no-map; + }; + + afe_dma_mem: memory@60f00000 { + compatible = "shared-dma-pool"; + reg = <0 0x60f00000 0 0x100000>; + no-map; + }; + + adsp_dma_mem: memory@61000000 { + compatible = "shared-dma-pool"; + reg = <0 0x61000000 0 0x100000>; no-map; }; @@ -152,6 +164,16 @@ apu_mem: memory@62000000 { }; }; +&adsp { + memory-region = <&adsp_dma_mem>, <&adsp_mem>; + status = "okay"; +}; + +&afe { + memory-region = <&afe_dma_mem>; + status = "okay"; +}; + &cpu0 { cpu-supply = <&mt6359_vcore_buck_reg>; }; @@ -514,6 +536,18 @@ &mt6359_vsram_others_ldo_reg { &pio { mediatek,rsel-resistance-in-si-unit; + audio_default_pins: audio-default-pins { + pins-cmd-dat { + pinmux = , + , + , + , + , + , + ; + }; + }; + dsi0_backlight_pins: dsi0-backlight-pins { pins-backlight-en { pinmux = ; @@ -854,6 +888,26 @@ &scp { status = "okay"; }; +&sound { + compatible = "mediatek,mt8195_mt6359"; + model = "mt8395-evk"; + pinctrl-names = "default"; + pinctrl-0 = <&audio_default_pins>; + audio-routing = + "Headphone", "Headphone L", + "Headphone", "Headphone R"; + mediatek,adsp = <&adsp>; + status = "okay"; + + headphone-dai-link { + link-name = "DL_SRC_BE"; + + codec { + sound-dai = <&pmic 0>; + }; + }; +}; + &spi1 { /* Exposed at 40 pin connector */ pinctrl-0 = <&spi1_pins>;