From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751836AbdFOTyn (ORCPT ); Thu, 15 Jun 2017 15:54:43 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:8295 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750749AbdFOTyl (ORCPT ); Thu, 15 Jun 2017 15:54:41 -0400 Subject: Re: [PATCH v5] arm64: dts: hi6220: Add k3-dma and i2s/hdmi audio support To: John Stultz , lkml References: <1497464717-32234-1-git-send-email-john.stultz@linaro.org> CC: Zhangfei Gao , Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Rob Herring , Andy Green , Dave Long , Guodong Xu , Antonio Borneo , Olof Johansson , Arnd Bergmann From: Wei Xu Message-ID: <5942E520.2060105@hisilicon.com> Date: Thu, 15 Jun 2017 20:50:56 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1497464717-32234-1-git-send-email-john.stultz@linaro.org> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.47.88.226] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.5942E52E.016F,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: cec1b52449b10770f37faca1c05c6572 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi John, On 2017/6/14 19:25, John Stultz wrote: > Add entry for k3-dma driver and i2s/hdmi audio devices. > > This enables HDMI audio output. > > Cc: Zhangfei Gao > Cc: Liam Girdwood > Cc: Mark Brown > Cc: Jaroslav Kysela > Cc: Takashi Iwai > Cc: Wei Xu > Cc: Rob Herring > Cc: Andy Green > Cc: Dave Long > Cc: Guodong Xu > Cc: Antonio Borneo > Cc: Olof Johansson > Cc: Arnd Bergmann > Signed-off-by: John Stultz > v2: > * Split core i2s entry into dtsi and hdmi specific bits into > hikey dts > v4: > * Rework simple-card to use many-dai-links method, as > there may be other links in the future > v5: > * Rework audio description to use the audio-card-graph method > as requested by Mark. > --- Applied to the hisilicon arm64 dt tree. Sorry for the delay! Thanks! BR, Wei > arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 34 +++++++++++++++++++++++--- > arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 26 ++++++++++++++++++++ > 2 files changed, 57 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > index 5cdfe73..2b52630 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts > @@ -468,6 +468,11 @@ > method = "smc"; > }; > }; > + > + sound_card { > + compatible = "audio-graph-card"; > + dais = <&i2s0_port0>; > + }; > }; > > &uart2 { > @@ -508,10 +513,33 @@ > interrupts = <1 2>; > pd-gpio = <&gpio0 4 0>; > adi,dsi-lanes = <4>; > + #sound-dai-cells = <0>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + port@0 { > + adv7533_in: endpoint { > + remote-endpoint = <&dsi_out0>; > + }; > + }; > + port@2 { > + reg = <2>; > + codec_endpoint: endpoint { > + remote-endpoint = <&i2s0_cpu_endpoint>; > + }; > + }; > + }; > + }; > +}; > > - port { > - adv7533_in: endpoint { > - remote-endpoint = <&dsi_out0>; > +&i2s0 { > + > + ports { > + i2s0_port0: port@0 { > + i2s0_cpu_endpoint: endpoint { > + remote-endpoint = <&codec_endpoint>; > + dai-format = "i2s"; > }; > }; > }; > diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi > index 5013e4b..f2e218c 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi > @@ -332,6 +332,19 @@ > status = "disabled"; > }; > > + dma0: dma@f7370000 { > + compatible = "hisilicon,k3-dma-1.0"; > + reg = <0x0 0xf7370000 0x0 0x1000>; > + #dma-cells = <1>; > + dma-channels = <15>; > + dma-requests = <32>; > + interrupts = <0 84 4>; > + clocks = <&sys_ctrl HI6220_EDMAC_ACLK>; > + dma-no-cci; > + dma-type = "hi6220_dma"; > + status = "ok"; > + }; > + > dual_timer0: timer@f8008000 { > compatible = "arm,sp804", "arm,primecell"; > reg = <0x0 0xf8008000 0x0 0x1000>; > @@ -805,6 +818,19 @@ > #thermal-sensor-cells = <1>; > }; > > + i2s0: i2s@f7118000{ > + compatible = "hisilicon,hi6210-i2s"; > + reg = <0x0 0xf7118000 0x0 0x8000>; /* i2s unit */ > + interrupts = ; /* 155 "DigACodec_intr"-32 */ > + clocks = <&sys_ctrl HI6220_DACODEC_PCLK>, > + <&sys_ctrl HI6220_BBPPLL0_DIV>; > + clock-names = "dacodec", "i2s-base"; > + dmas = <&dma0 15 &dma0 14>; > + dma-names = "rx", "tx"; > + hisilicon,sysctrl-syscon = <&sys_ctrl>; > + #sound-dai-cells = <1>; > + }; > + > thermal-zones { > > cls0: cls0 { >