From patchwork Thu Nov 25 10:08:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 12638809 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 1B21FC433F5 for ; Thu, 25 Nov 2021 10:09:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TCW9QDmzNSxU3x6DbgdHZvhn6Jm14mMASaTDPo6SHmM=; b=L0QfCXJXRA39QU NZJMCjMcdYTV3amxLOTMbNUjE+yhRhteGJk5gEsHlYGuo8V1g7QaZp96ezdng1W9xe1MDT/gFW/Jc lIRtNogz0rpq++5vhJ42ONyFx//W9gH9KDYjmkN9ZJWYfow7lli0obsNG93vc+qgvANPJ4oV+w22B VrPb4rngJDKwhk89nVmfKjwTSzDZVr3Ppn7uRRf59fzduxRYgE/vpJmDnB3tAQrai6rYvqXH8kP/K XXM8I7nJo0iEtJawuXJyoLULtODp6PXCgkE64jo1shGYN2plY6tjNTicTfrZdF8GJ9MxOTM7tiqc1 fGD49Ypy9Hh5nscCmhKg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqBhP-0071jb-OM; Thu, 25 Nov 2021 10:09:51 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqBh3-0071do-4V; Thu, 25 Nov 2021 10:09:30 +0000 Received: by mail-wm1-x330.google.com with SMTP id o19-20020a1c7513000000b0033a93202467so4284505wmc.2; Thu, 25 Nov 2021 02:09:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JtO60bk1RCy4qMnS1/rQRVPFrbrpTCMvxJUpVoIqlWA=; b=ReGBe7+5AvucSDE2RMRe5whSP0SAb8lWJ5R/KQNu4gOzSMIVWWo8n4AEi2CAsOG+9C uT5lCxuRrHfNXGsy4hMnBGvq59ZDMERw0+e7nOYaEJERSDd8Kb+Bsia/8lQVEdKt79H+ +jQChXvEmRcQtGbDpqbJTuQgXAZJYA15oa74+hpAfOxd8vphXFG0U3wr2r5MdvwVsCjw hRL9GYS5W8sHfVStw+KXnTNCxcYZUNOAqrluKAKeMhA5rL5Ke8WWEWsOLZGorPt+Y2rn zi38of35vQIKl7TCWldclrKRxMjFbXq0F8SQ+VcOCR/+Vzr9jfinZZNXjiYIzm95kuM0 Zq6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JtO60bk1RCy4qMnS1/rQRVPFrbrpTCMvxJUpVoIqlWA=; b=KOeFDfgA5AZ+dvFAIhwvdEwHZ92VniuzfPHYPVbm1CE380FWJ1ddlCOH4S4WExmKwH i4GEbYyBXwdUcR4Ato9KNPu4WaPyBR0+juhXeEA8IIFbB2lt78b0/BpfI5JSgNHFwpi2 24j+6+ptbNQY5RfWGLyFv+n+I+Hi3xfRQ4dN3ZWKZ37uY2kmV7KNaSu9cWJks9NMRH25 G19cz9hdjEP/uUo8alPgCmGBZbVSSU1NfC2ay6LmSGLt15l54gB1m4GQ3IGyPO7pkb5g MkVN72z9IiirQo066ZsGaq8Mv8reYB4emBP040Rlxlrvke59vjtLNYrk20tT7JSg0Uyk Q5tw== X-Gm-Message-State: AOAM530ezA3IWD7kiV8ID6LBu82ed2cVoVD0xnijQTxfdhinlBfyOpLI PV2WkkyjG5Zh3ubtBlYg+HY= X-Google-Smtp-Source: ABdhPJzZLPDc2HewTHumJfbaWU/Daj4OM99frT8vDFf8AI3I960W9RaDktVTqGH9eNyMTYFmOMcx0Q== X-Received: by 2002:a05:600c:1e1c:: with SMTP id ay28mr5726488wmb.131.1637834967755; Thu, 25 Nov 2021 02:09:27 -0800 (PST) Received: from localhost.localdomain (84-72-105-84.dclient.hispeed.ch. [84.72.105.84]) by smtp.gmail.com with ESMTPSA id l7sm2903533wry.86.2021.11.25.02.09.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 02:09:27 -0800 (PST) From: Nicolas Frattaroli To: Rob Herring , Heiko Stuebner Cc: Nicolas Frattaroli , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: rockchip: rk356x: Add HDMI audio nodes Date: Thu, 25 Nov 2021 11:08:34 +0100 Message-Id: <20211125100836.423808-2-frattaroli.nicolas@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211125100836.423808-1-frattaroli.nicolas@gmail.com> References: <20211125100836.423808-1-frattaroli.nicolas@gmail.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_020929_211243_6CC726E2 X-CRM114-Status: GOOD ( 12.18 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This adds the i2s0 node and an hdmi-sound sound device to the rk356x device tree. On the rk356[68], the i2s0 controller is connected to HDMI audio. Signed-off-by: Nicolas Frattaroli Tested-by: Michael Riesch --- arch/arm64/boot/dts/rockchip/rk356x.dtsi | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 3c09cf6d4c37..ad4053402eef 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -614,6 +614,21 @@ hdmi_in_vp2: endpoint@2 { }; }; + hdmi_sound: hdmi-sound { + compatible = "simple-audio-card"; + simple-audio-card,format = "i2s"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,name = "hdmi-sound"; + status = "disabled"; + + simple-audio-card,cpu { + sound-dai = <&i2s0_8ch>; + }; + simple-audio-card,codec { + sound-dai = <&hdmi>; + }; + }; + qos_gpu: qos@fe128000 { compatible = "rockchip,rk3568-qos", "syscon"; reg = <0x0 0xfe128000 0x0 0x20>; @@ -789,6 +804,23 @@ spdif: spdif@fe460000 { status = "disabled"; }; + i2s0_8ch: i2s@fe400000 { + compatible = "rockchip,rk3568-i2s-tdm"; + reg = <0x0 0xfe400000 0x0 0x1000>; + interrupts = ; + assigned-clocks = <&cru CLK_I2S0_8CH_TX_SRC>, <&cru CLK_I2S0_8CH_RX_SRC>; + assigned-clock-rates = <1188000000>, <1188000000>; + clocks = <&cru MCLK_I2S0_8CH_TX>, <&cru MCLK_I2S0_8CH_RX>, <&cru HCLK_I2S0_8CH>; + clock-names = "mclk_tx", "mclk_rx", "hclk"; + dmas = <&dmac1 0>; + dma-names = "tx"; + resets = <&cru SRST_M_I2S0_8CH_TX>, <&cru SRST_M_I2S0_8CH_RX>; + reset-names = "tx-m", "rx-m"; + rockchip,grf = <&grf>; + #sound-dai-cells = <0>; + status = "disabled"; + }; + i2s1_8ch: i2s@fe410000 { compatible = "rockchip,rk3568-i2s-tdm"; reg = <0x0 0xfe410000 0x0 0x1000>; From patchwork Thu Nov 25 10:08:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Frattaroli X-Patchwork-Id: 12638811 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 A3399C433F5 for ; Thu, 25 Nov 2021 10:10:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=a3oby7pMfcLdXFiaFEgxDoOVJQz8mJcksTIYxt+vnYM=; b=XLvROFJuYbFMCc 6we9hWlOhyMjImyo4YepvQ0Q2wpC7YU9zzBdmKOjNYBSQNf2qKMM9EGuePMeHdUBDdzUrtVus/i0w Cp72ANV5wCvR803NsR501GoWXzFeDzsQjUHfsF0OsWZ59gofD+Ge/MV7VbutHgqoVKVR9R8wgXT8r YsupqmwsN2RLebOBi8rSmpEMXjBFk86xKgGCE3mFhITXSbJvfkW+7BKJ0nBtCf5pJg5s1b1Z3bTIt mvhYTGNckHhCLzRX94Ll5wbZdYfe+9CwPYgueqG9wPSOcJDaYPXaoRLXT15SsWSKBlfxjD1Ue2GZ2 s0DwgP90O/c6ZinxSjYA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqBhb-0071on-QM; Thu, 25 Nov 2021 10:10:03 +0000 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mqBh6-0071es-ED; Thu, 25 Nov 2021 10:09:33 +0000 Received: by mail-wr1-x42a.google.com with SMTP id l16so10403887wrp.11; Thu, 25 Nov 2021 02:09:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sonVc1z4s9yp3qxr+30Ehdj21m5HXG+GbXci1EkRyd0=; b=hwSRl65sCjY5p6Ah68cgEhOn5lyv3p5q0Ihu2PGJCQ8QQLD1TREGoM9k4Vod5IpK4+ v4UurAfVX/1ESHnGkeiZ0juIiGePZJD0cUCRHOCsVlDJOwGnJNyVA7yc9MX/MFE0vf+d 1Z+n8TCef3/M2CVpLTqQEK5gz+0sfaB2/sFq/vmu8aOK+k+FKP++udq/wgg11dbe1N7J kzPOkbaRuOdBTYvNtgqT2Q1kdWArEUSZWbPyjpd9WScUz6nNRypAmeoy2CmzT0WBj2gG FvqwmSWeFqLiOtIdCCfPBZ+IXz9eHUGR9bkJarMRJInpsA1Wf43QZ28Rh1y6D74gEkio BWdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sonVc1z4s9yp3qxr+30Ehdj21m5HXG+GbXci1EkRyd0=; b=VNf0gpGtEHmTV8uT2AEiFjTMjkBNrcUDE9fGs15uJFmosSc4QbB8S84l2lnmRZNoiQ yedmOwO+Cpjc1giZx64nRatHWRR5P8t8xP4pcY62jS7mbMVlfDvbTEoJXpTI+JyVfmS5 n2z9AWds377DOj/3pjFoEJuIeOC9kPmCngYcl9N35+MGCrmEqNC36R6pEL16qzbnwBjW YGRMfLv/5coxB0qohbzpRHWxZ/xNA3ubwbWDsIIpOnEbCXAEmbpeIgZDHnUW44b6jwVZ pE+wYmDe5LAe1gkwpqCWZjgM5CVPcyIPLzV8hsZCWmVn58dgZA/Ygb28d9yjxyRstkzq jdgA== X-Gm-Message-State: AOAM532ivbnU0CSAKyi34x3YPWthrH67db9lNzTFsz0wWdsptN2HmoGe sgHHskJlVHbRz9BuKRBgquALO3VnwCM= X-Google-Smtp-Source: ABdhPJz7Sq1cO0e4VX/vnA//UUtpVjsWfZx/+npu6v564qfgpY05nOs4hhGcU62Dfts5NH7unWsh+Q== X-Received: by 2002:adf:ee0c:: with SMTP id y12mr5105453wrn.82.1637834971101; Thu, 25 Nov 2021 02:09:31 -0800 (PST) Received: from localhost.localdomain (84-72-105-84.dclient.hispeed.ch. [84.72.105.84]) by smtp.gmail.com with ESMTPSA id l7sm2903533wry.86.2021.11.25.02.09.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 02:09:30 -0800 (PST) From: Nicolas Frattaroli To: Rob Herring , Heiko Stuebner Cc: Nicolas Frattaroli , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: rockchip: Enable HDMI audio on Quartz64 A Date: Thu, 25 Nov 2021 11:08:35 +0100 Message-Id: <20211125100836.423808-3-frattaroli.nicolas@gmail.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211125100836.423808-1-frattaroli.nicolas@gmail.com> References: <20211125100836.423808-1-frattaroli.nicolas@gmail.com> MIME-Version: 1.0 X-Patchwork-Bot: notify X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211125_020932_503565_C1D5FF8E X-CRM114-Status: GOOD ( 11.08 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org This enables the i2s0 controller and the hdmi-sound node on the PINE64 Quartz64 Model A single-board computer. Signed-off-by: Nicolas Frattaroli --- arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts index a4453c82b03d..0598510dce58 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts @@ -215,6 +215,10 @@ &hdmi_in_vp0 { status = "okay"; }; +&hdmi_sound { + status = "okay"; +}; + &gpu { mali-supply = <&vdd_gpu>; status = "okay"; @@ -444,6 +448,10 @@ regulator-state-mem { }; }; +&i2s0_8ch { + status = "okay"; +}; + &i2s1_8ch { pinctrl-names = "default"; pinctrl-0 = <&i2s1m0_sclktx