From patchwork Thu Jan 23 22:28:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Detlev Casanova X-Patchwork-Id: 13948713 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 E33D5C02182 for ; Thu, 23 Jan 2025 22:33:36 +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=CJ2LgP1zcI6D9CZmTqDUnO2CFra8WcbcyzGNJfUiXA8=; b=yiW98cz20b+ZSL2USEshR0mXkr ZPNqrl26Cv2Fc9lo7xeWvU5F48bZFjGQEo1zNc1brHJHx4DhYe8gybXUCeg6QvsDnKT7aG3eVf+QD O3AgbmhsOmUbANHr9dfyTSyJPzCZbZ9e3vZc30Z+BAKPhAJv29Mmr56yXtZI6Ew0L6VPTc9VhZFjz 5bWHJ9NFp9SIl0wk5UpAwLO05/+D9gF80YcciiVPR7y5t4KQQhpS21F1vip+R2ChLAULWhk4NqXVi kuLELkE6Kl0d8bmzB4ISsQQ9IKJST9dQwQbqRdY3GuUcNx2eKxYVp3LcCPXEQHHIXi7yqJkcLcmuU mRjvEbBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tb5lP-0000000DPyI-07Ic; Thu, 23 Jan 2025 22:33:27 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tb5hN-0000000DPJj-2DMF; Thu, 23 Jan 2025 22:29:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1737671355; bh=DYl+QLg+bXf1oFNxNjE9MmYOZbStaYtUHF6Ata+RLOA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vr2xpAN4ksdLDWbNRyZDBVw58o4axQ7f0jvRwJfz1gnFc4uARKRe5OPQwHZIZJ5Ti ZNK5UDQl2nlzsPH42JWBuMDqRYtZqaE9TSXSHGIfIfSCNlfYYoPzKhPEumnjCPq+Lc IRKTizZprjjrZrsE1O8KWNFQUbbxEpFbbuxrVHG65xw737BtusbliNkvUXheIYRm3g mPxfrrJM/W0ZHNWjiS5ha6spAJhsyJIGvhAeTacgR77k587pz+EImJpG+RoSEgJmob tQAb40UQt2hnYUBFtnYFoTS8l+UxNF9eikTRmMmqhNLXmwcqziqsYSA5rIK5tx05Ns Lp1me8BXbL8uQ== Received: from earth.mtl.collabora.ca (mtl.collabora.ca [66.171.169.34]) (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: detlev) by bali.collaboradmins.com (Postfix) with ESMTPSA id DE7C917E0FA7; Thu, 23 Jan 2025 23:29:11 +0100 (CET) From: Detlev Casanova To: linux-kernel@vger.kernel.org Cc: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sebastian Reichel , Cristian Ciocaltea , Alexey Charkov , Jianfeng Liu , Dragan Simic , FUKAUMI Naoki , Geert Uytterhoeven , Detlev Casanova , Johan Jonker , Kever Yang , Dmitry Baryshkov , Sugar Zhang , Algea Cao , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, kernel@collabora.com Subject: [PATCH v2 2/2] arm64: dts: rockchip: Add HDMI0 audio output on rock-5b Date: Thu, 23 Jan 2025 17:28:07 -0500 Message-ID: <20250123222850.223255-3-detlev.casanova@collabora.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250123222850.223255-1-detlev.casanova@collabora.com> References: <20250123222850.223255-1-detlev.casanova@collabora.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250123_142917_732682_5D8A57DD X-CRM114-Status: GOOD ( 12.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 Use the simple-audio-card driver with the hdmi0 QP node as CODEC and the i2s5 device as CPU. The simple-audio-card,mclk-fs value is set to 128 as it is done in the downstream driver. The #sound-dai-cells value is set to 0 in the hdmi0 node so that it can be used as an audio codec node. Signed-off-by: Detlev Casanova --- arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 1 + .../boot/dts/rockchip/rk3588-rock-5b.dts | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi index a337f3fb8377e..fcd1c85e6ce8f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-base.dtsi @@ -1395,6 +1395,7 @@ hdmi0: hdmi@fde80000 { reset-names = "ref", "hdp"; rockchip,grf = <&sys_grf>; rockchip,vo-grf = <&vo1_grf>; + #sound-dai-cells = <0>; status = "disabled"; ports { diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts index d597112f1d5b8..1909078538367 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts @@ -49,6 +49,21 @@ hdmi0_con_in: endpoint { }; }; + hdmi0-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <128>; + simple-audio-card,name = "hdmi0"; + + simple-audio-card,codec { + sound-dai = <&hdmi0>; + }; + + simple-audio-card,cpu { + sound-dai = <&i2s5_8ch>; + }; + }; + leds { compatible = "gpio-leds"; pinctrl-names = "default"; @@ -318,6 +333,10 @@ i2s0_8ch_p0_0: endpoint { }; }; +&i2s5_8ch { + status = "okay"; +}; + &package_thermal { polling-delay = <1000>;