From: mylene.josserand@free-electrons.com (Mylène Josserand)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 08/10] ARM: dts: sun8i: Add audio codec, dai and card for A33
Date: Tue, 17 Jan 2017 15:02:28 +0100 [thread overview]
Message-ID: <20170117140230.23142-9-mylene.josserand@free-electrons.com> (raw)
In-Reply-To: <20170117140230.23142-1-mylene.josserand@free-electrons.com>
Add the audio codec, dai and a simple card to be able to use the
audio stream of the builtin codec on sun8i SoC.
This commit adds also an audio-routing for the sound card node to link
the analog DAPM widgets (Right/Left DAC) and the digital one's as they
are created in different drivers.
Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com>
---
arch/arm/boot/dts/sun8i-a33.dtsi | 47 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 63d5181ffff8..fe8a4f4760d2 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -43,6 +43,7 @@
*/
#include "sun8i-a23-a33.dtsi"
+#include <dt-bindings/dma/sun4i-a10.h>
/ {
cpus {
@@ -69,6 +70,27 @@
reg = <0x40000000 0x80000000>;
};
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Sun8i Audio Card";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,frame-master = <&link_codec>;
+ simple-audio-card,bitclock-master = <&link_codec>;
+ simple-audio-card,mclk-fs = <512>;
+ simple-audio-card,aux-devs = <&codec_analog>;
+ simple-audio-card,routing =
+ "Left DAC", "Digital Left DAC",
+ "Right DAC", "Digital Right DAC";
+
+ simple-audio-card,cpu {
+ sound-dai = <&dai>;
+ };
+
+ link_codec: simple-audio-card,codec {
+ sound-dai = <&codec>;
+ };
+ };
+
soc at 01c00000 {
tcon0: lcd-controller at 01c0c000 {
compatible = "allwinner,sun8i-a33-tcon";
@@ -116,6 +138,31 @@
reset-names = "ahb";
};
+ dai: dai at 01c22c00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun6i-a31-i2s";
+ reg = <0x01c22c00 0x200>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
+ clock-names = "apb", "mod";
+ resets = <&ccu RST_BUS_CODEC>;
+ reset-names = "rst";
+ dmas = <&dma 15>, /* AUDIO_CODEC port */
+ <&dma 15>; /* AUDIO_CODEC port */
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ codec: codec at 01c22e00 {
+ #sound-dai-cells = <0>;
+ compatible = "allwinner,sun8i-a33-codec";
+ reg = <0x01c22e00 0x400>;
+ interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
+ clock-names = "bus", "mod";
+ status = "disabled";
+ };
+
fe0: display-frontend at 01e00000 {
compatible = "allwinner,sun8i-a33-display-frontend";
reg = <0x01e00000 0x20000>;
--
2.11.0
next prev parent reply other threads:[~2017-01-17 14:02 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 14:02 [PATCH v2 00/10] Add sun8i A33 audio driver Mylène Josserand
2017-01-17 14:02 ` [PATCH v2 01/10] ASoC: sun4i-i2s: Increase DMA max burst to 8 Mylène Josserand
2017-01-17 16:41 ` Maxime Ripard
2017-01-17 18:44 ` Applied "ASoC: sun4i-i2s: Increase DMA max burst to 8" to the asoc tree Mark Brown
2017-01-17 14:02 ` [PATCH v2 02/10] clk: ccu-sun8i-a33: Add CLK_SET_RATE_PARENT to ac-dig Mylène Josserand
2017-01-17 16:44 ` Maxime Ripard
2017-01-18 7:58 ` Mylene Josserand
2017-01-17 14:02 ` [PATCH v2 03/10] dt-bindings: sound: Add new reset compatible for sun4i-i2s Mylène Josserand
2017-01-17 16:46 ` Maxime Ripard
2017-01-18 8:23 ` Mylene Josserand
2017-01-17 14:02 ` [PATCH v2 04/10] ASoC: sun4i-i2s: Add quirks to handle new compatible for reset Mylène Josserand
2017-01-17 16:47 ` Maxime Ripard
2017-01-17 14:02 ` [PATCH v2 05/10] ASoC: Add sun8i digital audio codec Mylène Josserand
2017-01-17 16:20 ` Mylene Josserand
2017-01-17 14:02 ` [PATCH v2 06/10] ASoC: sun8i-codec-analog: Add amplifier event to fix first delay Mylène Josserand
2017-01-17 16:49 ` Maxime Ripard
2017-02-03 12:03 ` Applied "ASoC: sun8i-codec-analog: Add amplifier event to fix first delay" to the asoc tree Mark Brown
2017-01-17 14:02 ` [PATCH v2 07/10] dt-bindings: sound: Add sun8i audio documentation Mylène Josserand
2017-01-17 16:50 ` Mark Brown
2017-01-18 8:25 ` Mylene Josserand
2017-01-17 16:51 ` Maxime Ripard
2017-01-17 14:02 ` Mylène Josserand [this message]
2017-01-17 16:58 ` [PATCH v2 08/10] ARM: dts: sun8i: Add audio codec, dai and card for A33 Maxime Ripard
2017-01-17 14:02 ` [PATCH v2 09/10] ARM: dts: sun8i: parrot: Enable audio nodes Mylène Josserand
2017-01-17 14:02 ` [PATCH v2 10/10] ARM: dts: sun8i: sinlinx: " Mylène Josserand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170117140230.23142-9-mylene.josserand@free-electrons.com \
--to=mylene.josserand@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox