From patchwork Mon Oct 21 11:39:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fei Shao X-Patchwork-Id: 13843956 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 AE8B8D0E6FA for ; Mon, 21 Oct 2024 11:46:58 +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: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:In-Reply-To:References:List-Owner; bh=pFGqW2cFYVEn/q/mCaxZhdSAZg1df4AGxlVE7Nd7m2M=; b=w2WYenGJLjxiXbF420Raigf796 tsOGboKXWzLehtPZolfyGLESryC1PZbBy6WUd+KmHaATHzH41Dd+i5aTR0ZcgVIw1nAI6Dn8HlsP6 0w/HB9ymr/zvDtJT0ZQ0K1rx1We3unDc53GX+u0ZudEr3RECl65bOqoH5Q2cafOy0Thkp3gWZ0imE 4hk9S1jtzA46WtdbhXnb498wUu2V2aM7JVwTxa+YCAvcDncwzOJWPcZRWrsbk7PfB8e36KfKWd8Kk QBue3imCKWHOExPH/1pDYhYFO577rdXMnzQfLNozTz9g4Bj8qh3swwaO+20ghcCdrRQJpAly/nvN0 hgHrg98g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1t2qs1-0000000765Q-2eOL; Mon, 21 Oct 2024 11:46:45 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1t2qp4-000000075QO-10GZ for linux-arm-kernel@lists.infradead.org; Mon, 21 Oct 2024 11:43:43 +0000 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-2e30116efc9so3573871a91.2 for ; Mon, 21 Oct 2024 04:43:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1729511021; x=1730115821; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pFGqW2cFYVEn/q/mCaxZhdSAZg1df4AGxlVE7Nd7m2M=; b=U+zEb/xntIkcCwXnMSvHeLubpHL/UWS8rF/xbQ0BMX2DA/eYsuq9kDCjWfM9IRQj4q qiTlqBGFrtUToAml6J5ELTvc1MJtnLDMdnnoSBw5E76flQgzDR552/P0KJA72rGMXRHe LPgnyFESNcZ3KPnp5HylLPcmrj6zRqOchZGVo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729511021; x=1730115821; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pFGqW2cFYVEn/q/mCaxZhdSAZg1df4AGxlVE7Nd7m2M=; b=Wg6ky+mOs3FLsHKp4HxGR7d2nRezK8lDBkwdYgto+ZuExf1vA3rjF83VU0i+TCMp9v 2zt4OBPGUJnQsaaK36UqQkESZaWiPRMWljAKREFseB0RtwnBth8YTSPKmx7mIjyTJZKd ZTP86qAQyR7s13b1V0E5JfD9lZK0iCimtwEfAYYywmwl5WXYHLXpXsFBf8qVXszxm1lH 8WGeulaSkSxi/XmxUFYyeLKQa9wOEUrObzn7w9YqgW1iQ5p4Qt7jr1yg4UsvvYt2MzsN bWmnVevpnTeu+DbkK1Zec6sx67ja3lEtJNMpd/tGKiaMgXBLBCsmHK/J0b5/q7h3rRE0 l2qg== X-Forwarded-Encrypted: i=1; AJvYcCVcXti8SNSr1Ut7pjKSsFLbQPMQwE7MntCYXkoQNhnZ7Ad82OOVwfgC3L1Y7y1m09u+3YRKjPaKn8DuDFQUpQuT@lists.infradead.org X-Gm-Message-State: AOJu0Yz0lTz7yaOK2BNrnUfyhqQixSf4469KLIp6rce3zpUidhI6PDsH /YMAVWvgTjYPI7NFXLRGwWKr1mIMQzeywHCxX25VVZmq8fBh8yn1Vza634hJuB8JcV4AVOAfv14 = X-Google-Smtp-Source: AGHT+IH6P9i9bth3v9J1SxyMP+yL7cKvTFdnB58JeaUhpcK0fnL4b/zRVxwRyWOMVGHEvr9v/WRN+w== X-Received: by 2002:a17:90a:c590:b0:2e0:d693:7884 with SMTP id 98e67ed59e1d1-2e5616de895mr14134967a91.5.1729511020820; Mon, 21 Oct 2024 04:43:40 -0700 (PDT) Received: from fshao-p620.tpe.corp.google.com ([2401:fa00:1:10:66d2:3298:fcb4:c6c9]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2e5ad366cb8sm3536518a91.20.2024.10.21.04.43.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2024 04:43:40 -0700 (PDT) From: Fei Shao To: AngeloGioacchino Del Regno , Matthias Brugger Cc: Fei Shao , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH] arm64: dts: mediatek: mt8195-cherry: Use correct audio codec DAI Date: Mon, 21 Oct 2024 19:39:33 +0800 Message-ID: <20241021114318.1358681-1-fshao@chromium.org> X-Mailer: git-send-email 2.47.0.rc1.288.g06298d1525-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241021_044342_484689_296E3F4A X-CRM114-Status: GOOD ( 11.75 ) 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 The RT5682i and RT5682s drivers describe two DAIs: AIF1 supports both playback and capture, while AIF2 supports capture only. Cherry doesn't specify which DAI to use. Although this doesn't cause real issues because AIF1 happens to be the first DAI, it should be corrected: codec@1a: #sound-dai-cells: 1 was expected Update #sound-dai-cells to 1 and adjust DAI link usages accordingly. Fixes: 87728e3ccf35 ("arm64: dts: mediatek: mt8195-cherry: Specify sound DAI links and routing") Signed-off-by: Fei Shao --- arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index 75d56b2d5a3d..2c7b2223ee76 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -438,7 +438,7 @@ audio_codec: codec@1a { /* Realtek RT5682i or RT5682s, sharing the same configuration */ reg = <0x1a>; interrupts-extended = <&pio 89 IRQ_TYPE_EDGE_BOTH>; - #sound-dai-cells = <0>; + #sound-dai-cells = <1>; realtek,jd-src = <1>; AVDD-supply = <&mt6359_vio18_ldo_reg>; @@ -1181,7 +1181,7 @@ hs-playback-dai-link { link-name = "ETDM1_OUT_BE"; mediatek,clk-provider = "cpu"; codec { - sound-dai = <&audio_codec>; + sound-dai = <&audio_codec 0>; }; }; @@ -1189,7 +1189,7 @@ hs-capture-dai-link { link-name = "ETDM2_IN_BE"; mediatek,clk-provider = "cpu"; codec { - sound-dai = <&audio_codec>; + sound-dai = <&audio_codec 0>; }; };