All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Clément Péron" <peron.clem@gmail.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>
Cc: "Jaroslav Kysela" <perex@perex.cz>,
	"Takashi Iwai" <tiwai@suse.com>,
	"Marcus Cooper" <codekipper@gmail.com>,
	"Jernej Skrabec" <jernej.skrabec@siol.net>,
	alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
	"Clément Péron" <peron.clem@gmail.com>
Subject: [PATCH 13/16] arm64: dts: allwinner: a64: Add HDMI audio
Date: Sat,  4 Jul 2020 13:38:59 +0200	[thread overview]
Message-ID: <20200704113902.336911-14-peron.clem@gmail.com> (raw)
In-Reply-To: <20200704113902.336911-1-peron.clem@gmail.com>

From: Marcus Cooper <codekipper@gmail.com>

Add a simple-soundcard to link audio between HDMI and I2S.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index c662f6a170ce..6a321fdc8e90 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -102,6 +102,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun50i-a64-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
@@ -856,6 +875,7 @@ i2s2: i2s@1c22800 {
 			resets = <&ccu RST_BUS_I2S2>;
 			dma-names = "tx";
 			dmas = <&dma 27>;
+			allwinner,playback-channels = <8>;
 			status = "disabled";
 		};
 
@@ -1155,6 +1175,7 @@ deinterlace: deinterlace@1e00000 {
 		};
 
 		hdmi: hdmi@1ee0000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-a64-dw-hdmi",
 				     "allwinner,sun8i-a83t-dw-hdmi";
 			reg = <0x01ee0000 0x10000>;
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: "Clément Péron" <peron.clem@gmail.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>
Cc: devicetree@vger.kernel.org,
	"Jernej Skrabec" <jernej.skrabec@siol.net>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	"Takashi Iwai" <tiwai@suse.com>,
	"Marcus Cooper" <codekipper@gmail.com>,
	linux-sunxi@googlegroups.com,
	"Clément Péron" <peron.clem@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 13/16] arm64: dts: allwinner: a64: Add HDMI audio
Date: Sat,  4 Jul 2020 13:38:59 +0200	[thread overview]
Message-ID: <20200704113902.336911-14-peron.clem@gmail.com> (raw)
In-Reply-To: <20200704113902.336911-1-peron.clem@gmail.com>

From: Marcus Cooper <codekipper@gmail.com>

Add a simple-soundcard to link audio between HDMI and I2S.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index c662f6a170ce..6a321fdc8e90 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -102,6 +102,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun50i-a64-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
@@ -856,6 +875,7 @@ i2s2: i2s@1c22800 {
 			resets = <&ccu RST_BUS_I2S2>;
 			dma-names = "tx";
 			dmas = <&dma 27>;
+			allwinner,playback-channels = <8>;
 			status = "disabled";
 		};
 
@@ -1155,6 +1175,7 @@ deinterlace: deinterlace@1e00000 {
 		};
 
 		hdmi: hdmi@1ee0000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-a64-dw-hdmi",
 				     "allwinner,sun8i-a83t-dw-hdmi";
 			reg = <0x01ee0000 0x10000>;
-- 
2.25.1


WARNING: multiple messages have this Message-ID (diff)
From: "Clément Péron" <peron.clem@gmail.com>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
	Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>
Cc: devicetree@vger.kernel.org,
	"Jernej Skrabec" <jernej.skrabec@siol.net>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
	"Takashi Iwai" <tiwai@suse.com>,
	"Jaroslav Kysela" <perex@perex.cz>,
	"Marcus Cooper" <codekipper@gmail.com>,
	linux-sunxi@googlegroups.com,
	"Clément Péron" <peron.clem@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 13/16] arm64: dts: allwinner: a64: Add HDMI audio
Date: Sat,  4 Jul 2020 13:38:59 +0200	[thread overview]
Message-ID: <20200704113902.336911-14-peron.clem@gmail.com> (raw)
In-Reply-To: <20200704113902.336911-1-peron.clem@gmail.com>

From: Marcus Cooper <codekipper@gmail.com>

Add a simple-soundcard to link audio between HDMI and I2S.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Marcus Cooper <codekipper@gmail.com>
Signed-off-by: Clément Péron <peron.clem@gmail.com>
---
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index c662f6a170ce..6a321fdc8e90 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -102,6 +102,25 @@ de: display-engine {
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,name = "sun50i-a64-hdmi";
+		simple-audio-card,mclk-fs = <128>;
+		simple-audio-card,frame-inversion;
+		status = "disabled";
+
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+			dai-tdm-slot-num = <2>;
+			dai-tdm-slot-width = <32>;
+		};
+	};
+
 	osc24M: osc24M_clk {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
@@ -856,6 +875,7 @@ i2s2: i2s@1c22800 {
 			resets = <&ccu RST_BUS_I2S2>;
 			dma-names = "tx";
 			dmas = <&dma 27>;
+			allwinner,playback-channels = <8>;
 			status = "disabled";
 		};
 
@@ -1155,6 +1175,7 @@ deinterlace: deinterlace@1e00000 {
 		};
 
 		hdmi: hdmi@1ee0000 {
+			#sound-dai-cells = <0>;
 			compatible = "allwinner,sun50i-a64-dw-hdmi",
 				     "allwinner,sun8i-a83t-dw-hdmi";
 			reg = <0x01ee0000 0x10000>;
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-07-04 11:39 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-04 11:38 [PATCH 00/16] Add Allwinner H3/H5/H6/A64 HDMI audio Clément Péron
2020-07-04 11:38 ` Clément Péron
2020-07-04 11:38 ` Clément Péron
2020-07-04 11:38 ` [PATCH 01/16] ASoC: sun4i-i2s: Add support for H6 I2S Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:15   ` Maxime Ripard
2020-07-06  5:15     ` Maxime Ripard
2020-07-06  5:15     ` Maxime Ripard
2020-07-10  5:44   ` [linux-sunxi] " Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-10 19:22     ` Jernej Škrabec
2020-07-10 19:22       ` Jernej Škrabec
2020-07-10 19:22       ` Jernej Škrabec
2020-07-11  1:43       ` Samuel Holland
2020-07-11  1:43         ` Samuel Holland
2020-07-11  1:43         ` Samuel Holland
2020-07-22  8:56     ` Clément Péron
2020-07-22  8:56       ` Clément Péron
2020-07-22  8:56       ` Clément Péron
2020-07-04 11:38 ` [PATCH 02/16] ASoC: sun4i-i2s: Adjust LRCLK width Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-10  5:44   ` [linux-sunxi] " Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-04 11:38 ` [PATCH 03/16] dt-bindings: ASoC: sun4i-i2s: Add H6 compatible Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38 ` [PATCH 04/16] ASoC: sun4i-i2s: Set sign extend sample Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:17   ` Maxime Ripard
2020-07-06  5:17     ` Maxime Ripard
2020-07-06  5:17     ` Maxime Ripard
2020-07-10  5:44   ` [linux-sunxi] " Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-22  9:12     ` Clément Péron
2020-07-22  9:12       ` Clément Péron
2020-07-22  9:12       ` Clément Péron
2020-07-04 11:38 ` [PATCH 05/16] ASoc: sun4i-i2s: Add 20 and 24 bit support Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:18   ` Maxime Ripard
2020-07-06  5:18     ` Maxime Ripard
2020-07-06  5:18     ` Maxime Ripard
2020-07-10  5:44   ` [linux-sunxi] " Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-07-10  5:44     ` Samuel Holland
2020-09-02 18:10     ` Jernej Škrabec
2020-09-02 18:10       ` Jernej Škrabec
2020-09-02 18:10       ` Jernej Škrabec
2020-09-03  2:22       ` Samuel Holland
2020-09-03  2:22         ` Samuel Holland
2020-09-03  2:22         ` Samuel Holland
2020-09-03  7:40         ` Maxime Ripard
2020-09-03  7:40           ` Maxime Ripard
2020-09-03  7:40           ` Maxime Ripard
2020-09-04 16:16           ` Charles Keepax
2020-09-04 16:16             ` Charles Keepax
2020-09-04 16:16             ` Charles Keepax
2020-09-04 16:23             ` Mark Brown
2020-09-04 16:23               ` Mark Brown
2020-09-04 16:23               ` Mark Brown
2020-07-04 11:38 ` [PATCH 06/16] ASoC: sun4i-i2s: Adjust regmap settings Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:24   ` Maxime Ripard
2020-07-06  5:24     ` Maxime Ripard
2020-07-06  5:24     ` Maxime Ripard
2020-07-04 11:38 ` [PATCH 07/16] ASoC: sun4i-i2s: Fix sun8i volatile regs Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:25   ` Maxime Ripard
2020-07-06  5:25     ` Maxime Ripard
2020-07-06  5:25     ` Maxime Ripard
2020-07-04 11:38 ` [PATCH 08/16] arm64: dts: allwinner: h6: Add HDMI audio node Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:29   ` Maxime Ripard
2020-07-06  5:29     ` Maxime Ripard
2020-07-06  5:29     ` Maxime Ripard
2020-07-08 16:17     ` Jernej Škrabec
2020-07-08 16:17       ` Jernej Škrabec
2020-07-08 16:17       ` Jernej Škrabec
2020-07-04 11:38 ` [PATCH 09/16] arm64: dts: allwinner: h6: Enable HDMI sound for Beelink GS1 Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38 ` [PATCH 10/16] arm: dts: sunxi: h3/h5: Add DAI node for HDMI Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-18 21:24   ` [linux-sunxi] " Samuel Holland
2020-07-18 21:24     ` Samuel Holland
2020-07-18 21:24     ` Samuel Holland
2020-07-04 11:38 ` [PATCH 11/16] arm: dts: sunxi: h3/h5: Add HDMI audio Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38 ` [PATCH 12/16] arm64: dts: allwinner: a64: Add DAI node for HDMI Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-04 11:38 ` Clément Péron [this message]
2020-07-04 11:38   ` [PATCH 13/16] arm64: dts: allwinner: a64: Add HDMI audio Clément Péron
2020-07-04 11:38   ` Clément Péron
2020-07-06  5:31   ` Maxime Ripard
2020-07-06  5:31     ` Maxime Ripard
2020-07-06  5:31     ` Maxime Ripard
2020-07-08 16:00     ` Jernej Škrabec
2020-07-08 16:00       ` Jernej Škrabec
2020-07-08 16:00       ` Jernej Škrabec
2020-07-04 11:39 ` [PATCH 14/16] arm: sun8i: h3: Add HDMI audio to Orange Pi 2 Clément Péron
2020-07-04 11:39   ` Clément Péron
2020-07-04 11:39   ` Clément Péron
2020-07-04 11:39 ` [PATCH 15/16] arm: sun8i: h3: Add HDMI audio to Beelink X2 Clément Péron
2020-07-04 11:39   ` Clément Péron
2020-07-04 11:39   ` Clément Péron
2020-07-04 11:39 ` [PATCH 16/16] arm64: dts: allwinner: a64: Add HDMI audio to Pine64 Clément Péron
2020-07-04 11:39   ` Clément Péron
2020-07-04 11:39   ` Clément Péron

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=20200704113902.336911-14-peron.clem@gmail.com \
    --to=peron.clem@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=codekipper@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jernej.skrabec@siol.net \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sunxi@googlegroups.com \
    --cc=mripard@kernel.org \
    --cc=perex@perex.cz \
    --cc=robh+dt@kernel.org \
    --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.