From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB491C282CC for ; Mon, 4 Feb 2019 12:59:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 855F72082E for ; Mon, 4 Feb 2019 12:59:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731223AbfBDM7y (ORCPT ); Mon, 4 Feb 2019 07:59:54 -0500 Received: from www1102.sakura.ne.jp ([219.94.129.142]:42119 "EHLO www1102.sakura.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729254AbfBDM7y (ORCPT ); Mon, 4 Feb 2019 07:59:54 -0500 Received: from fsav107.sakura.ne.jp (fsav107.sakura.ne.jp [27.133.134.234]) by www1102.sakura.ne.jp (8.15.2/8.15.2) with ESMTP id x14CxcCM039741; Mon, 4 Feb 2019 21:59:38 +0900 (JST) (envelope-from katsuhiro@katsuster.net) Received: from www1102.sakura.ne.jp (219.94.129.142) by fsav107.sakura.ne.jp (F-Secure/fsigk_smtp/530/fsav107.sakura.ne.jp); Mon, 04 Feb 2019 21:59:38 +0900 (JST) X-Virus-Status: clean(F-Secure/fsigk_smtp/530/fsav107.sakura.ne.jp) Received: from [192.168.1.2] (119.104.232.153.ap.dti.ne.jp [153.232.104.119]) (authenticated bits=0) by www1102.sakura.ne.jp (8.15.2/8.15.2) with ESMTPSA id x14CxbVr039738 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NO); Mon, 4 Feb 2019 21:59:38 +0900 (JST) (envelope-from katsuhiro@katsuster.net) Subject: Re: [PATCH] arm64: dts: rockchip: add HDMI sound node for rk3328-rock64 To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20190202043444.9308-1-katsuhiro@katsuster.net> <1970132.3b67tCGWFf@phil> From: Katsuhiro Suzuki Message-ID: Date: Mon, 4 Feb 2019 21:59:37 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.5.0 MIME-Version: 1.0 In-Reply-To: <1970132.3b67tCGWFf@phil> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hello Heiko, On 2019/02/03 18:06, Heiko Stuebner wrote: > Am Samstag, 2. Februar 2019, 05:34:44 CET schrieb Katsuhiro Suzuki: >> This patch adds HDMI sound (I2S0) node and remove dma properties >> from UART2 node for rock64. >> >> The DMAC of rk3328 can use 8 channels at same time. Currently, total >> 7 channels are used as follows: >> - I2S1 2ch >> - UART2 2ch >> - SPDIF 1ch >> - SPI0 2ch >> >> HDMI audio using I2S0 that requires 2ch but DMAC has only 1 channel. >> >> UART2 can work without DMA resources, so this patch removes dma >> allocation for UART2 and reuses it to I2S0. > > I don't follow that description. How can i2s0 re-use the uart2 dma channels? > Looking at the dma table in the TRM, uart2 has channels 6+7 while i2s0 > uses channels 11+12. They should just run concurrently? > Sorry for confusing... 6 or 7 is as ID number of slave DMA channel. TRM calls it 'Req number'. Req number 6+7 and 11+12 can work concurrently but TRM says DMAC can transfer 8 DMA channels at same time. So all 16 Req numbers cannot activate at same time. It should be keep less or equal than 8 numbers. For details, DMAC of RK3328 is ARM PL330 (or compatible IP). - Local variable 'chan_id' of of_dma_pl330_xlate() is Req number. This is from Device-Tree info. - Array 'channels' of struct pl330_dmac is DMA channels of DMAC. pl330_request_channel() allocate DMA channel that is requested from other drivers. Local variable 'chans' has max channels can run concurrently. Current setting: channels chan_id 0 8 1 9 2 14 3 15 4 10 5 6 6 7 7 (not used) Best Regards, Katsuhiro Suzuki >> >> Signed-off-by: Katsuhiro Suzuki >> --- >> .../arm64/boot/dts/rockchip/rk3328-rock64.dts | 24 ++++++++++++++++++- >> arch/arm64/boot/dts/rockchip/rk3328.dtsi | 1 + >> 2 files changed, 24 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts >> index 2157a528276b..e21645aa3fa5 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts >> +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts >> @@ -68,7 +68,8 @@ >> sound { >> compatible = "audio-graph-card"; >> label = "rockchip,rk3328"; >> - dais = <&i2s1_p0 >> + dais = <&i2s0_p0 >> + &i2s1_p0 >> &spdif_p0>; >> }; >> >> @@ -141,6 +142,12 @@ >> >> &hdmi { >> status = "okay"; >> + >> + port@0 { >> + hdmi_p0_0: endpoint { >> + remote-endpoint = <&i2s0_p0_0>; >> + }; >> + }; >> }; >> >> &hdmiphy { >> @@ -256,6 +263,18 @@ >> }; >> }; >> >> +&i2s0 { >> + status = "okay"; >> + >> + i2s0_p0: port { >> + i2s0_p0_0: endpoint { >> + dai-format = "i2s"; >> + mclk-fs = <256>; >> + remote-endpoint = <&hdmi_p0_0>; >> + }; >> + }; >> +}; >> + >> &i2s1 { >> status = "okay"; >> >> @@ -343,6 +362,9 @@ >> >> &uart2 { >> status = "okay"; >> + >> + /delete-property/ dmas; >> + /delete-property/ dma-names; >> }; >> >> &u2phy { >> diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi >> index 84f14b132e8f..374b5da93a35 100644 >> --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi >> +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi >> @@ -665,6 +665,7 @@ >> pinctrl-names = "default"; >> pinctrl-0 = <&hdmi_cec &hdmii2c_xfer &hdmi_hpd>; >> rockchip,grf = <&grf>; >> + #sound-dai-cells = <0>; > > please make that a separate patch > > > Heiko > > >