Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1560613
| From | Mylène Josserand <mylene.josserand@free-electrons.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 08/10] ARM: dts: sun8i: Add audio codec, dai and card for A33 |
| Date | 2017-01-17 15:10 +0100 |
| Message-ID | <t0CCv-84W-47@gated-at.bofh.it> (permalink) |
| References | <t0CCu-84W-17@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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@01c00000 {
tcon0: lcd-controller@01c0c000 {
compatible = "allwinner,sun8i-a33-tcon";
@@ -116,6 +138,31 @@
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>;
+ reset-names = "rst";
+ dmas = <&dma 15>, /* AUDIO_CODEC port */
+ <&dma 15>; /* AUDIO_CODEC port */
+ 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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v2 00/10] Add sun8i A33 audio driver Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
[PATCH v2 08/10] ARM: dts: sun8i: Add audio codec, dai and card for A33 Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
Re: [PATCH v2 08/10] ARM: dts: sun8i: Add audio codec, dai and card for A33 Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-01-17 18:00 +0100
[PATCH v2 07/10] dt-bindings: sound: Add sun8i audio documentation Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
Re: [PATCH v2 07/10] dt-bindings: sound: Add sun8i audio documentation Mark Brown <broonie@kernel.org> - 2017-01-17 18:00 +0100
Re: [PATCH v2 07/10] dt-bindings: sound: Add sun8i audio documentation Mylene Josserand <mylene.josserand@free-electrons.com> - 2017-01-18 09:30 +0100
Re: [PATCH v2 07/10] dt-bindings: sound: Add sun8i audio documentation Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-01-17 18:00 +0100
[PATCH v2 09/10] ARM: dts: sun8i: parrot: Enable audio nodes Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
[PATCH v2 03/10] dt-bindings: sound: Add new reset compatible for sun4i-i2s Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
Re: [PATCH v2 03/10] dt-bindings: sound: Add new reset compatible for sun4i-i2s Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-01-17 17:50 +0100
Re: [PATCH v2 03/10] dt-bindings: sound: Add new reset compatible for sun4i-i2s Mylene Josserand <mylene.josserand@free-electrons.com> - 2017-01-18 09:30 +0100
[PATCH v2 02/10] clk: ccu-sun8i-a33: Add CLK_SET_RATE_PARENT to ac-dig Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
Re: [PATCH v2 02/10] clk: ccu-sun8i-a33: Add CLK_SET_RATE_PARENT to ac-dig Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-01-17 18:00 +0100
Re: [PATCH v2 02/10] clk: ccu-sun8i-a33: Add CLK_SET_RATE_PARENT to ac-dig Mylene Josserand <mylene.josserand@free-electrons.com> - 2017-01-18 09:00 +0100
[PATCH v2 04/10] ASoC: sun4i-i2s: Add quirks to handle new compatible for reset Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
Re: [PATCH v2 04/10] ASoC: sun4i-i2s: Add quirks to handle new compatible for reset Maxime Ripard <maxime.ripard@free-electrons.com> - 2017-01-17 17:50 +0100
[PATCH v2 10/10] ARM: dts: sun8i: sinlinx: Enable audio nodes Mylène Josserand <mylene.josserand@free-electrons.com> - 2017-01-17 15:10 +0100
csiph-web