From nobody Tue Feb 10 18:36:52 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E628FC74A5B for ; Wed, 29 Mar 2023 15:34:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230482AbjC2PeX (ORCPT ); Wed, 29 Mar 2023 11:34:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230452AbjC2Pdz (ORCPT ); Wed, 29 Mar 2023 11:33:55 -0400 Received: from ex01.ufhost.com (ex01.ufhost.com [61.152.239.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7B33469C; Wed, 29 Mar 2023 08:33:41 -0700 (PDT) Received: from EXMBX166.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX166", Issuer "EXMBX166" (not verified)) by ex01.ufhost.com (Postfix) with ESMTP id CCC9824E194; Wed, 29 Mar 2023 23:33:34 +0800 (CST) Received: from EXMBX168.cuchost.com (172.16.6.78) by EXMBX166.cuchost.com (172.16.6.76) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 29 Mar 2023 23:33:34 +0800 Received: from localhost.localdomain (113.72.144.76) by EXMBX168.cuchost.com (172.16.6.78) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 29 Mar 2023 23:33:33 +0800 From: Walker Chen To: Jaroslav Kysela , Takashi Iwai , "Rob Herring" , Krzysztof Kozlowski , Conor Dooley , Emil Renner Berthing , Walker Chen CC: , , , Subject: [PATCH v1 3/3] riscv: dts: starfive: add tdm node and sound card Date: Wed, 29 Mar 2023 23:33:20 +0800 Message-ID: <20230329153320.31390-4-walker.chen@starfivetech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230329153320.31390-1-walker.chen@starfivetech.com> References: <20230329153320.31390-1-walker.chen@starfivetech.com> MIME-Version: 1.0 X-Originating-IP: [113.72.144.76] X-ClientProxiedBy: EXCAS066.cuchost.com (172.16.6.26) To EXMBX168.cuchost.com (172.16.6.78) X-YovoleRuleAgent: yovoleflag Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add the tdm controller node and sound card for the StarFive JH7110 SoC. Signed-off-by: Walker Chen --- .../jh7110-starfive-visionfive-2.dtsi | 87 +++++++++++++++++++ arch/riscv/boot/dts/starfive/jh7110.dtsi | 34 ++++++++ 2 files changed, 121 insertions(+) diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi= b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 1155b97b593d..35137c2edf5d 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -62,6 +62,10 @@ clock-frequency =3D <297000000>; }; =20 +&wm8960_mclk { + clock-frequency =3D <24576000>; +}; + &i2srx_bclk_ext { clock-frequency =3D <12288000>; }; @@ -102,6 +106,14 @@ pinctrl-names =3D "default"; pinctrl-0 =3D <&i2c0_pins>; status =3D "okay"; + + wm8960: codec@1a { + compatible =3D "wlf,wm8960"; + reg =3D <0x1a>; + #sound-dai-cells =3D <0>; + + wlf,shared-lrclk; + }; }; =20 &i2c2 { @@ -214,6 +226,40 @@ slew-rate =3D <0>; }; }; + + tdm0_pins: tdm0-pins { + tdm0-pins-tx { + pinmux =3D ; + bias-pull-up; + drive-strength =3D <2>; + input-disable; + input-schmitt-disable; + slew-rate =3D <0>; + }; + + tdm0-pins-rx { + pinmux =3D ; + input-enable; + }; + + tdm0-pins-sync { + pinmux =3D ; + input-enable; + }; + + tdm0-pins-pcmclk { + pinmux =3D ; + input-enable; + }; + }; }; =20 &uart0 { @@ -221,3 +267,44 @@ pinctrl-0 =3D <&uart0_pins>; status =3D "okay"; }; + +&tdm { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&tdm0_pins>; + status =3D "okay"; +}; + +&sound0 { + simple-audio-card,dai-link@0 { + reg =3D <0>; + status =3D "okay"; + format =3D "dsp_a"; + bitclock-master =3D <&dailink_master>; + frame-master =3D <&dailink_master>; + + widgets =3D + "Microphone", "Mic Jack", + "Line", "Line In", + "Line", "Line Out", + "Speaker", "Speaker", + "Headphone", "Headphone Jack"; + routing =3D + "Headphone Jack", "HP_L", + "Headphone Jack", "HP_R", + "Speaker", "SPK_LP", + "Speaker", "SPK_LN", + "LINPUT1", "Mic Jack", + "LINPUT3", "Mic Jack", + "RINPUT1", "Mic Jack", + "RINPUT2", "Mic Jack"; + cpu { + sound-dai =3D <&tdm>; + }; + + dailink_master:codec { + sound-dai =3D <&wm8960>; + clocks =3D <&wm8960_mclk>; + clock-names =3D "mclk"; + }; + }; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts= /starfive/jh7110.dtsi index b503b6137743..a89158d1d7a6 100644 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -210,6 +210,12 @@ #clock-cells =3D <0>; }; =20 + wm8960_mclk: wm8960_mclk { + compatible =3D "fixed-clock"; + clock-output-names =3D "wm8960_mclk"; + #clock-cells =3D <0>; + }; + i2srx_bclk_ext: i2srx-bclk-ext-clock { compatible =3D "fixed-clock"; clock-output-names =3D "i2srx_bclk_ext"; @@ -375,6 +381,27 @@ status =3D "disabled"; }; =20 + tdm: tdm@10090000 { + compatible =3D "starfive,jh7110-tdm"; + reg =3D <0x0 0x10090000 0x0 0x1000>; + clocks =3D <&syscrg JH7110_SYSCLK_TDM_AHB>, + <&syscrg JH7110_SYSCLK_TDM_APB>, + <&syscrg JH7110_SYSCLK_TDM_INTERNAL>, + <&syscrg JH7110_SYSCLK_TDM_TDM>, + <&syscrg JH7110_SYSCLK_MCLK_INNER>, + <&tdm_ext>; + clock-names =3D "tdm_ahb", "tdm_apb", + "tdm_internal", "tdm", + "mclk_inner", "tdm_ext"; + resets =3D <&syscrg JH7110_SYSRST_TDM_AHB>, + <&syscrg JH7110_SYSRST_TDM_APB>, + <&syscrg JH7110_SYSRST_TDM_CORE>; + dmas =3D <&dma 20>, <&dma 21>; + dma-names =3D "rx","tx"; + #sound-dai-cells =3D <0>; + status =3D "disabled"; + }; + stgcrg: clock-controller@10230000 { compatible =3D "starfive,jh7110-stgcrg"; reg =3D <0x0 0x10230000 0x0 0x10000>; @@ -601,5 +628,12 @@ #reset-cells =3D <1>; power-domains =3D <&pwrc JH7110_PD_VOUT>; }; + + sound0: snd-card0 { + compatible =3D "simple-audio-card"; + simple-audio-card,name =3D "Starfive-TDM-Sound-Card"; + #address-cells =3D <1>; + #size-cells =3D <0>; + }; }; }; --=20 2.17.1