From: "Mylène Josserand" <mylene.josserand@free-electrons.com>
To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org,
mark.rutland@arm.com, maxime.ripard@free-electrons.com,
wens@csie.org, perex@perex.cz, tiwai@suse.com
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
thomas.petazzoni@free-electrons.com,
mylene.josserand@free-electrons.com,
alexandre.belloni@free-electrons.com
Subject: [PATCH v3 6/8] ARM: dts: sun8i: Add audio codec, dai and card for A33
Date: Tue, 31 Jan 2017 11:05:50 +0100 [thread overview]
Message-ID: <20170131100552.27949-7-mylene.josserand@free-electrons.com> (raw)
In-Reply-To: <20170131100552.27949-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 | 45 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 5a9ba43ccb07..18c174fef84f 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -104,6 +104,28 @@
reg = <0x40000000 0x80000000>;
};
+ sound: sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "sun8i-a33-audio";
+ 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";
+ status = "disabled";
+
+ simple-audio-card,cpu {
+ sound-dai = <&dai>;
+ };
+
+ link_codec: simple-audio-card,codec {
+ sound-dai = <&codec>;
+ };
+ };
+
soc@01c00000 {
tcon0: lcd-controller@01c0c000 {
compatible = "allwinner,sun8i-a33-tcon";
@@ -151,6 +173,29 @@
reset-names = "ahb";
};
+ dai: dai@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>;
+ dmas = <&dma 15>, <&dma 15>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ codec: codec@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@01e00000 {
compatible = "allwinner,sun8i-a33-display-frontend";
reg = <0x01e00000 0x20000>;
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: "Mylène Josserand" <mylene.josserand@free-electrons.com>
To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org,
mark.rutland@arm.com, maxime.ripard@free-electrons.com,
wens@csie.org, perex@perex.cz, tiwai@suse.com
Cc: thomas.petazzoni@free-electrons.com, devicetree@vger.kernel.org,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
alexandre.belloni@free-electrons.com,
mylene.josserand@free-electrons.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 6/8] ARM: dts: sun8i: Add audio codec, dai and card for A33
Date: Tue, 31 Jan 2017 11:05:50 +0100 [thread overview]
Message-ID: <20170131100552.27949-7-mylene.josserand@free-electrons.com> (raw)
In-Reply-To: <20170131100552.27949-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 | 45 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 5a9ba43ccb07..18c174fef84f 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -104,6 +104,28 @@
reg = <0x40000000 0x80000000>;
};
+ sound: sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "sun8i-a33-audio";
+ 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";
+ status = "disabled";
+
+ simple-audio-card,cpu {
+ sound-dai = <&dai>;
+ };
+
+ link_codec: simple-audio-card,codec {
+ sound-dai = <&codec>;
+ };
+ };
+
soc@01c00000 {
tcon0: lcd-controller@01c0c000 {
compatible = "allwinner,sun8i-a33-tcon";
@@ -151,6 +173,29 @@
reset-names = "ahb";
};
+ dai: dai@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>;
+ dmas = <&dma 15>, <&dma 15>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ codec: codec@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@01e00000 {
compatible = "allwinner,sun8i-a33-display-frontend";
reg = <0x01e00000 0x20000>;
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
WARNING: multiple messages have this Message-ID (diff)
From: mylene.josserand@free-electrons.com (Mylène Josserand)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 6/8] ARM: dts: sun8i: Add audio codec, dai and card for A33
Date: Tue, 31 Jan 2017 11:05:50 +0100 [thread overview]
Message-ID: <20170131100552.27949-7-mylene.josserand@free-electrons.com> (raw)
In-Reply-To: <20170131100552.27949-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 | 45 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index 5a9ba43ccb07..18c174fef84f 100644
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -104,6 +104,28 @@
reg = <0x40000000 0x80000000>;
};
+ sound: sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "sun8i-a33-audio";
+ 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";
+ status = "disabled";
+
+ 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";
@@ -151,6 +173,29 @@
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>;
+ dmas = <&dma 15>, <&dma 15>;
+ 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-31 10:10 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-31 10:05 [PATCH v3 0/8] Add sun8i A33 audio driver Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` [PATCH v3 1/8] ASoC: sun4i-i2s: Update binding documentation to include A31 Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:30 ` Maxime Ripard
2017-01-31 10:30 ` Maxime Ripard
2017-01-31 10:30 ` Maxime Ripard
2017-01-31 21:17 ` Mark Brown
2017-01-31 21:17 ` Mark Brown
2017-01-31 21:17 ` Mark Brown
2017-02-01 7:44 ` Mylene Josserand
2017-02-01 7:44 ` Mylene Josserand
2017-02-01 7:44 ` Mylene Josserand
2017-02-01 11:59 ` Mark Brown
2017-02-01 11:59 ` Mark Brown
2017-02-01 11:59 ` Mark Brown
2017-02-01 15:08 ` Mylene Josserand
2017-02-01 15:08 ` Mylene Josserand
2017-02-01 15:08 ` Mylene Josserand
2017-02-01 17:26 ` Rob Herring
2017-02-01 17:26 ` Rob Herring
2017-02-01 17:26 ` Rob Herring
2017-01-31 10:05 ` [PATCH v3 2/8] ASoC: sun4i-i2s: Add quirks to handle a31 compatible Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:31 ` Maxime Ripard
2017-01-31 10:31 ` Maxime Ripard
2017-01-31 10:31 ` Maxime Ripard
2017-01-31 10:05 ` [PATCH v3 3/8] ASoC: Add sun8i digital audio codec Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:35 ` Maxime Ripard
2017-01-31 10:35 ` Maxime Ripard
2017-01-31 10:35 ` Maxime Ripard
2017-01-31 11:34 ` [PATCH] ASoC: fix platform_no_drv_owner.cocci warnings kbuild test robot
2017-01-31 11:34 ` kbuild test robot
2017-01-31 11:34 ` kbuild test robot
2017-01-31 11:34 ` [PATCH v3 3/8] ASoC: Add sun8i digital audio codec kbuild test robot
2017-01-31 11:34 ` kbuild test robot
2017-01-31 11:34 ` kbuild test robot
2017-01-31 10:05 ` [PATCH v3 4/8] ASoC: sun8i-codec-analog: Add amplifier event to fix first delay Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:35 ` Maxime Ripard
2017-01-31 10:35 ` Maxime Ripard
2017-01-31 10:35 ` Maxime Ripard
2017-01-31 10:05 ` [PATCH v3 5/8] ASoC: codecs: Add sun8i-a33 binding documentation Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:36 ` Maxime Ripard
2017-01-31 10:36 ` Maxime Ripard
2017-01-31 10:36 ` Maxime Ripard
2017-02-01 17:30 ` Rob Herring
2017-02-01 17:30 ` Rob Herring
2017-02-01 17:30 ` Rob Herring
2017-01-31 10:05 ` Mylène Josserand [this message]
2017-01-31 10:05 ` [PATCH v3 6/8] ARM: dts: sun8i: Add audio codec, dai and card for A33 Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` [PATCH v3 7/8] ARM: dts: sun8i: parrot: Enable audio nodes Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` Mylène Josserand
2017-01-31 10:05 ` [PATCH v3 8/8] ARM: dts: sun8i: sinlinx: " Mylène Josserand
2017-01-31 10:05 ` 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=20170131100552.27949-7-mylene.josserand@free-electrons.com \
--to=mylene.josserand@free-electrons.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
--cc=tiwai@suse.com \
--cc=wens@csie.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.