From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mta1.migadu.com (out-55.mta1.migadu.com [95.215.58.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB3204483AF for ; Fri, 28 Aug 2026 11:46:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787917583; cv=none; b=U/DkhJqPxL3hI6GhXt7sy3I8C4zgClGQyi5XI/WurglPD459vuyxo+joNn5Na6X8BEYPPvTVRACvL9oPLLpC4E91U7uy35Yq3pChZP4c/g19gOL0O1mNq1YGry+9cLNCk4t8tXXxdlee1ksYq4CuBQBSNHUooegrT91Ne+SV8sg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787917583; c=relaxed/simple; bh=GZ6xCYTSi9co+IIKhthafL94am9XVPBEdirIBtSwOT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b6ypTMnipFRmhifSBtEd5k9ms3JJSVZB8u/yxnhveIABgV7drd1dbQXNV/t7dlu8R6jXWzbcZh9661+DSkAuEwW7P5rQzIxmRpbmPQjt1Sec7/5rd+3s7o6WJV1I7Cbl0hv1GwRbCdtDBKGJokMWykeMmvE1t/ClhFBykYmlRT4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=cknow-tech.com; spf=pass smtp.mailfrom=cknow-tech.com; dkim=pass (2048-bit key) header.d=cknow-tech.com header.i=@cknow-tech.com header.b=QEQQdNdX; arc=none smtp.client-ip=95.215.58.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=cknow-tech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cknow-tech.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cknow-tech.com header.i=@cknow-tech.com header.b="QEQQdNdX" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=GZ6xCYTSi9co+IIKhthafL94am9XVPBEdirIBtSwOT0=; c=simple/simple; d=cknow-tech.com; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787917565; v=1; x=1788522365; b=QEQQdNdXFBQOheJ1lHP0l3fnpUJyNtKD8mlySnnJaFYxYELojmjqEpFaxy6Q/Dvu5YAbc9Lk /kyQdPTGJE0dsBeM2gqjFpTpEoH+1lw2nILKnTzFhY9vE/llLwRzClc5Klw3GT7/leXgAmUP4nT yt9OwS96Cd9bYejADjSxHs04OqblwMzPkHilvN4N3W1DKellj0EyxFG4Car5JnZoO8YfxuPUIpJ FBVIFGyMeZg+pt0pEOYeuUzHuuQGBm/KY9C18gICTHZARWXX1LpBVBNzbNV8bvcNIXTIqGdB0dQ FnlznTKtQY2gCVj0sli4Khbnmoktv5buHB2Nwp7hc0xeA== X-Envelope-To: linux-kernel@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 8da0395c564e6944; Fri, 28 Aug 2026 11:46:04 +0000 X-Mizu-Trace-ID: 8da0395c564e6944 X-Migadu-Flow: FLOW_OUT From: Diederik de Haas To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: Ricardo Pardini , Marcin Juszkiewicz , Daniele Briguglio , Hugh Cole-Baker , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, Diederik de Haas Subject: [PATCH 6/7] arm64: dts: rockchip: Improve sound config on NanoPC-T6 Date: Fri, 28 Aug 2026 13:43:06 +0200 Message-ID: <20260828114530.1315798-7-diederik@cknow-tech.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260828114530.1315798-1-diederik@cknow-tech.com> References: <20260828114530.1315798-1-diederik@cknow-tech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The kernel can manage the I2S MCLK output gates since commit 02b9b0bb6269 ("clk: rockchip: rk3588: add GATE_GRF clocks for I2S MCLK output to IO") So switch to I2S0_8CH_MCLKOUT_TO_IO to do exactly that. The audio ports are used in audio-graph-card, but simple-audio-card uses sound-dai phandles to establish the DAI links. So drop the pointless ports. Add a label to the soundcard to be used by tools like alsamixer. Sort the various properties according to the DTS coding standard. Signed-off-by: Diederik de Haas --- .../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi index e42b2a14fc82..eb0eb124c4cd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi @@ -100,14 +100,14 @@ fan: pwm-fan { sound { compatible = "simple-audio-card"; - pinctrl-names = "default"; + label = "Onboard Analog Realtek ALC5616"; pinctrl-0 = <&hp_det>; + pinctrl-names = "default"; - simple-audio-card,name = "realtek,rt5616-codec"; simple-audio-card,format = "i2s"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,hp-det-gpios = <&gpio1 RK_PC4 GPIO_ACTIVE_LOW>; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "realtek,rt5616-codec"; simple-audio-card,widgets = "Headphone", "Headphones", @@ -121,6 +121,7 @@ sound { simple-audio-card,cpu { sound-dai = <&i2s0_8ch>; }; + simple-audio-card,codec { sound-dai = <&rt5616>; }; @@ -551,17 +552,11 @@ &i2c7 { rt5616: codec@1b { compatible = "realtek,rt5616"; reg = <0x1b>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&cru I2S0_8CH_MCLKOUT_TO_IO>; + assigned-clock-rates = <12288000>; + clocks = <&cru I2S0_8CH_MCLKOUT_TO_IO>; clock-names = "mclk"; #sound-dai-cells = <0>; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; - assigned-clock-rates = <12288000>; - - port { - rt5616_p0_0: endpoint { - remote-endpoint = <&i2s0_8ch_p0_0>; - }; - }; }; /* connected with MIPI-CSI1 */ @@ -573,21 +568,9 @@ &i2c8 { }; &i2s0_8ch { + pinctrl-0 = <&i2s0_lrck &i2s0_mclk &i2s0_sclk &i2s0_sdi0 &i2s0_sdo0>; pinctrl-names = "default"; - pinctrl-0 = <&i2s0_lrck - &i2s0_mclk - &i2s0_sclk - &i2s0_sdi0 - &i2s0_sdo0>; status = "okay"; - - i2s0_8ch_p0: port { - i2s0_8ch_p0_0: endpoint { - dai-format = "i2s"; - mclk-fs = <256>; - remote-endpoint = <&rt5616_p0_0>; - }; - }; }; &i2s5_8ch { -- 2.55.0