* [PATCH 3/3] arm64: dts: hi3660-hikey960: Add i2s & sound device
@ 2019-02-28 14:08 Pengcheng Li
2019-03-01 16:45 ` John Stultz
0 siblings, 1 reply; 2+ messages in thread
From: Pengcheng Li @ 2019-02-28 14:08 UTC (permalink / raw)
To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
lgirdwood, broonie, perex, tiwai, john.stultz, alsa-devel,
linux-kernel
Cc: lipengcheng8, suzhuangluan, kongfei, liyuequan, cash.qianli,
huangli295, hantanglei, wangyoulin1, ninggaoyu, xuwei5
From: Youlin Wang <wangyoulin1@hisilicon.com>
Signed-off-by: Youlin Wang <wangyoulin1@hisilicon.com>
Signed-off-by: Tanglei Han <hantanglei@huawei.com>
Signed-off-by: Guangke Ji <jiguangke@huawei.com>
Signed-off-by: Feng Chen <puck.chen@hisilicon.com>
Signed-off-by: Kaihua Zhong <zhongkaihua@huawei.com>
Signed-off-by: Jun Chen <chenjun14@huawei.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Yiping Xu <xuyiping@hisilicon.com>
Signed-off-by: Pengcheng Li <lipengcheng8@huawei.com>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
---
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 29 +++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 186251f..457cebc 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -27,6 +27,35 @@
/* rewrite this at bootloader */
reg = <0x0 0x0 0x0 0x0>;
};
+
+ i2s2: hi3660_i2s {
+ compatible = "hisilicon,hi3660-i2s-1.0";
+ reg = <0x0 0xe804f800 0x0 0x400>,
+ <0x0 0xe804e000 0x0 0x400>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s2_pmx_func &i2s2_cfg_func>;
+ dmas = <&asp_dmac 18 &asp_dmac 19>;
+ dma-names = "rx", "tx";
+ #sound-dai-cells = <0>;
+ };
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "hikey-hdmi";
+ simple-audio-card,format = "i2s";
+
+ simple-audio-card,bitclock-master = <&sound_master>;
+ simple-audio-card,frame-master = <&sound_master>;
+
+ sound_master: simple-audio-card,cpu {
+ sound-dai = <&i2s2>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&adv7533>;
+ };
+ };
+
};
&uart5 {
--
2.8.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 3/3] arm64: dts: hi3660-hikey960: Add i2s & sound device
2019-02-28 14:08 [PATCH 3/3] arm64: dts: hi3660-hikey960: Add i2s & sound device Pengcheng Li
@ 2019-03-01 16:45 ` John Stultz
0 siblings, 0 replies; 2+ messages in thread
From: John Stultz @ 2019-03-01 16:45 UTC (permalink / raw)
To: Pengcheng Li
Cc: Wei Xu, Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon,
Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
Linux-ALSA, lkml, Zhuangluan Su, Kongfei, Liyuequan, Qianli (A),
huangli (I), Hantanglei, wangyoulin, ninggaoyu, xuwei (O)
On Thu, Feb 28, 2019 at 6:24 AM Pengcheng Li <lipengcheng8@huawei.com> wrote:
> diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> index 186251f..457cebc 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
> @@ -27,6 +27,35 @@
> /* rewrite this at bootloader */
> reg = <0x0 0x0 0x0 0x0>;
> };
> +
> + i2s2: hi3660_i2s {
> + compatible = "hisilicon,hi3660-i2s-1.0";
> + reg = <0x0 0xe804f800 0x0 0x400>,
> + <0x0 0xe804e000 0x0 0x400>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s2_pmx_func &i2s2_cfg_func>;
> + dmas = <&asp_dmac 18 &asp_dmac 19>;
> + dma-names = "rx", "tx";
> + #sound-dai-cells = <0>;
> + };
> +
> + sound {
> + compatible = "simple-audio-card";
> + simple-audio-card,name = "hikey-hdmi";
> + simple-audio-card,format = "i2s";
> +
> + simple-audio-card,bitclock-master = <&sound_master>;
> + simple-audio-card,frame-master = <&sound_master>;
> +
> + sound_master: simple-audio-card,cpu {
> + sound-dai = <&i2s2>;
> + };
> +
> + simple-audio-card,codec {
> + sound-dai = <&adv7533>;
> + };
> + };
> +
> };
Hey Pengcheng,
Thanks for sending this out! I've noticed one small issue with
this dts patch compared to the previous iterations.
When building I hit the following errors:
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts:292.27-294.5:
Warning (sound_dai_property): /sound/simple-audio-card,codec: Missing
property '#sound-dai-cells' in node /soc/i2c@ffd72000/adv7533@39 or
bad phandle (referred from sound-dai[0])
Which seems to us missing the sound-dai-cells addition to the adv7511
node we had the first chunk of the patch here:
https://git.linaro.org/people/john.stultz/android-dev.git/commit/?h=dev/hikey960-mainline-WIP&id=4279d58b622acd686b4d17fbf378ace1c467763e
thanks
-john
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-01 16:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-28 14:08 [PATCH 3/3] arm64: dts: hi3660-hikey960: Add i2s & sound device Pengcheng Li
2019-03-01 16:45 ` John Stultz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).