Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1446795
| From | John Stultz <john.stultz@linaro.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [RFC][PATCH 10/10 v2] dts: hi6220: Add k3-dma and i2s/hdmi audio support |
| Date | 2016-07-20 01:30 +0200 |
| Message-ID | <rWMCC-1Wj-33@gated-at.bofh.it> (permalink) |
| References | <rWMCB-1Wj-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
Add entry for k3-dma driver and i2s/hdmi audio devices.
This enables HDMI audio output.
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Andy Green <andy@warmcat.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v2:
* Split core i2s entry into dtsi and hdmi specific bits into hikey dts
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 22 ++++++++++++++++++
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 31 ++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index e92a30c..6979c55 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -221,6 +221,28 @@
};
};
};
+
+ hi6210_hdmi_codec: hi6210_hdmi_codec {
+ compatible = "hisilicon,hi6210-hdmi-audio-codec";
+ #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 = <&i2s0>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&hi6210_hdmi_codec>;
+ };
+ };
};
&uart2 {
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 189d215..9c60bff 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -228,6 +228,8 @@
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <2>;
+ #sound-dai-cells = <0>;
+ interrupt-parent = <&gic>;
ranges;
sram: sram@fff80000 {
@@ -325,6 +327,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>;
@@ -800,6 +815,22 @@
#thermal-sensor-cells = <1>;
};
+ i2s0: hi6210_i2s {
+ compatible = "hisilicon,hi6210-i2s";
+ reg = <0x0 0xf7118000 0x0 0x8000>, /* i2s unit */
+ <0x0 0xf7030000 0x0 0x400>, /* syscon */
+ <0x0 0xf7032000 0x0 0x400>; /* pmctrl */
+ interrupts = <0 123 0x4>; /* 155 "DigACodec_intr"-32 */
+ pinctrl-names = "default";
+ pinctrl-0 = <&bt_pmx_func &bt_cfg_func>;
+ 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";
+ #sound-dai-cells = <0>;
+ };
+
thermal-zones {
cls0: cls0 {
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[RFC][PATCH 00/10 v2] Add HDMI audio support for HiKey John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 02/10 v2] k3dma: Fix dma err offsets John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 06/10 v2] ASoC: add hi6210-i2s DT bindings John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 01/10 v2] k3dma: Fix hisi burst clipping John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 09/10 v2] ASoC: hisilicon: Add hi6210 hdmi codec driver John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
Re: [RFC][PATCH 09/10 v2] ASoC: hisilicon: Add hi6210 hdmi codec driver Mark Brown <broonie@kernel.org> - 2016-07-20 02:40 +0200
[RFC][PATCH 03/10 v2] k3dma: Fix "nobody cared" message seen on any error John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 04/10 v2] k3dma: Add cyclic mode for audio John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 08/10 v2] ASoC: add hi6210-hdmi-audio-codec DT bindings John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 10/10 v2] dts: hi6220: Add k3-dma and i2s/hdmi audio support John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
[RFC][PATCH 07/10 v2] ASoC: hisilicon: Add hi6210 i2s audio driver John Stultz <john.stultz@linaro.org> - 2016-07-20 01:30 +0200
Re: [RFC][PATCH 07/10 v2] ASoC: hisilicon: Add hi6210 i2s audio driver Mark Brown <broonie@kernel.org> - 2016-07-20 02:30 +0200
Re: [RFC][PATCH 07/10 v2] ASoC: hisilicon: Add hi6210 i2s audio driver John Stultz <john.stultz@linaro.org> - 2016-07-20 19:00 +0200
Re: [RFC][PATCH 07/10 v2] ASoC: hisilicon: Add hi6210 i2s audio driver Mark Brown <broonie@kernel.org> - 2016-07-20 19:10 +0200
Re: [RFC][PATCH 00/10 v2] Add HDMI audio support for HiKey Mark Brown <broonie@kernel.org> - 2016-07-20 02:30 +0200
csiph-web