linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc
@ 2018-12-26  0:52 Kuninori Morimoto
  2018-12-26  0:53 ` [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card Kuninori Morimoto
                   ` (8 more replies)
  0 siblings, 9 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:52 UTC (permalink / raw)
  To: Simon; +Cc: Magnus, linux-renesas-soc


Hi Simon

ULCB-KF sound is using pcm3168, and it needed driver update
to use it. Now, necessary patches are applied to linus branch.
It includes renesas_defconfig,  and Ebisu update (which was already
posted, but, not yet accepted), too.

1) - 5) : For ULCB-KF update
6)      : For Ebisu
7) - 8) : For defconfig

Kuninori Morimoto (8):
  1) arm64: renesas: ulcb: use audio-graph-card
  2) arm64: renesas: ulcb: add HDMI sound support
  3) arm64: renesas: ulcb-kf: add pcm3168 sound codec
  4) arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
  5) arm64: renesas: r8a7796: remove BUSIF0 settings from rcar_sound,ssi
  6) arm64: renesas: r8a77990-ebisu: use simple-audio-card
  7) arm64: defconfig: select Kingfisher Sound related configs
  8) arm64: renesas_defconfig: select Kingfisher Sound related configs

 arch/arm64/boot/dts/renesas/r8a7795.dtsi       |  40 ++++----
 arch/arm64/boot/dts/renesas/r8a7796.dtsi       |  40 ++++----
 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts |   5 +-
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi       | 132 +++++++++++++++++++++++++
 arch/arm64/boot/dts/renesas/ulcb.dtsi          |  66 +++++++++----
 arch/arm64/configs/defconfig                   |   1 +
 arch/arm64/configs/renesas_defconfig           |   2 +
 7 files changed, 225 insertions(+), 61 deletions(-)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
@ 2018-12-26  0:53 ` Kuninori Morimoto
  2019-01-02  9:34   ` Simon Horman
  2018-12-26  0:53 ` [PATCH 2/8] arm64: renesas: ulcb: add HDMI sound support Kuninori Morimoto
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:53 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

ULCB can use daughter board which is called as KingFisher.
It has extra sound interface, thus we want to use it.
But, basically, ALSA SoC can't use Multiple sound card with single
CPU sound interface (= SSI). Thus we need to use Single Sound Card
with multiple DAI interface.

To be easy to expand ULCB sound card on KingFisher, it is better to
use multi-dai-link style sound card on ULCB sound DT.

Now, "simple-audio-card" / "audio-graph-card" both can support
multi-dai-link style, but HDMI sound support (which is not yet supported
on ULCB) needs "audio-graph-card".
Using audio-graph-card is better selection.
This patch exchange current sound card to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/boot/dts/renesas/ulcb.dtsi | 39 ++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index f519d0c..209dda7 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -83,20 +83,11 @@
 		regulator-always-on;
 	};
 
-	rsnd_ak4613: sound {
-		compatible = "simple-audio-card";
+	sound_card: sound {
+		compatible = "audio-graph-card";
+		label = "rcar-sound";
 
-		simple-audio-card,format = "left_j";
-		simple-audio-card,bitclock-master = <&sndcpu>;
-		simple-audio-card,frame-master = <&sndcpu>;
-
-		sndcpu: simple-audio-card,cpu {
-			sound-dai = <&rcar_sound>;
-		};
-
-		sndcodec: simple-audio-card,codec {
-			sound-dai = <&ak4613>;
-		};
+		dais = <&rsnd_port0>;
 	};
 
 	vcc_sdhi0: regulator-vcc-sdhi0 {
@@ -211,6 +202,12 @@
 		asahi-kasei,out4-single-end;
 		asahi-kasei,out5-single-end;
 		asahi-kasei,out6-single-end;
+
+		port {
+			ak4613_endpoint: endpoint {
+				remote-endpoint = <&rsnd_for_ak4613>;
+			};
+		};
 	};
 
 	cs2000: clk-multiplier@4f {
@@ -384,10 +381,18 @@
 		 <&audio_clk_c>,
 		 <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
 
-	rcar_sound,dai {
-		dai0 {
-			playback = <&ssi0 &src0 &dvc0>;
-			capture  = <&ssi1 &src1 &dvc1>;
+	ports {
+		rsnd_port0: port@0 {
+			rsnd_for_ak4613: endpoint {
+				remote-endpoint = <&ak4613_endpoint>;
+
+				dai-format = "left_j";
+				bitclock-master = <&rsnd_for_ak4613>;
+				frame-master = <&rsnd_for_ak4613>;
+
+				playback = <&ssi0 &src0 &dvc0>;
+				capture  = <&ssi1 &src1 &dvc1>;
+			};
 		};
 	};
 };
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 2/8] arm64: renesas: ulcb: add HDMI sound support
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
  2018-12-26  0:53 ` [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card Kuninori Morimoto
@ 2018-12-26  0:53 ` Kuninori Morimoto
  2019-01-02  9:34   ` Simon Horman
  2018-12-26  0:53 ` [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec Kuninori Morimoto
                   ` (6 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:53 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch adds missing ULCB HDMI sound support.
To use sound card, HDMI video is mandatory.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/boot/dts/renesas/ulcb.dtsi | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 209dda7..23875bd 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -6,6 +6,14 @@
  * Copyright (C) 2016 Cogent Embedded, Inc.
  */
 
+/*
+ * SSI-AK4613
+ *	aplay   -D plughw:0,0 xxx.wav
+ *	arecord -D plughw:0,0 xxx.wav
+ * SSI-HDMI
+ *	aplay   -D plughw:0,1 xxx.wav
+ */
+
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 
@@ -87,7 +95,9 @@
 		compatible = "audio-graph-card";
 		label = "rcar-sound";
 
-		dais = <&rsnd_port0>;
+		dais = <&rsnd_port0	/* ak4613 */
+			&rsnd_port1	/* HDMI0  */
+			>;
 	};
 
 	vcc_sdhi0: regulator-vcc-sdhi0 {
@@ -173,6 +183,12 @@
 				remote-endpoint = <&hdmi0_con>;
 			};
 		};
+		port@2 {
+			reg = <2>;
+			dw_hdmi0_snd_in: endpoint {
+				remote-endpoint = <&rsnd_for_hdmi>;
+			};
+		};
 	};
 };
 
@@ -394,6 +410,17 @@
 				capture  = <&ssi1 &src1 &dvc1>;
 			};
 		};
+		rsnd_port1: port@1 {
+			rsnd_for_hdmi: endpoint {
+				remote-endpoint = <&dw_hdmi0_snd_in>;
+
+				dai-format = "i2s";
+				bitclock-master = <&rsnd_for_hdmi>;
+				frame-master = <&rsnd_for_hdmi>;
+
+				playback = <&ssi2>;
+			};
+		};
 	};
 };
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
  2018-12-26  0:53 ` [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card Kuninori Morimoto
  2018-12-26  0:53 ` [PATCH 2/8] arm64: renesas: ulcb: add HDMI sound support Kuninori Morimoto
@ 2018-12-26  0:53 ` Kuninori Morimoto
  2019-01-02  9:35   ` Simon Horman
  2018-12-26  0:53 ` [PATCH 4/8] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi Kuninori Morimoto
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:53 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

KingFisher has pcm3168 sound codec. This patch enables it.
Because pcm3168 can't handle symmetric channel on playback/
capture, we need to handle it as different DAI.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 132 +++++++++++++++++++++++++++++++
 1 file changed, 132 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
index 1b316d79..401c166 100644
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -6,11 +6,38 @@
  * Copyright (C) 2017 Cogent Embedded, Inc.
  */
 
+/*
+ * SSI-PCM3168A
+ *	aplay   -D plughw:0,2 xxx.wav
+ *	arecord -D plughw:0,3 xxx.wav
+ */
+
 / {
 	aliases {
 		serial1 = &hscif0;
 		serial2 = &scif1;
 	};
+
+	clksndsel: clksndsel {
+		#clock-cells = <0>;
+		compatible = "gpio-mux-clock";
+		clocks = <&cs2000>, <&audio_clk_a>; /* clk8snd, clksnd */
+		select-gpios = <&gpio_exp_75 13 GPIO_ACTIVE_HIGH>;
+	};
+
+	snd_3p3v: regulator-snd_3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "snd-3.3v";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	snd_vcc5v: regulator-snd_vcc5v {
+		compatible = "regulator-fixed";
+		regulator-name = "snd-vcc5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
 };
 
 &can0 {
@@ -44,6 +71,7 @@
 };
 
 &i2c2 {
+	/* U11 */
 	gpio_exp_74: gpio@74 {
 		compatible = "ti,tca9539";
 		reg = <0x74>;
@@ -53,6 +81,13 @@
 		interrupt-parent = <&gpio6>;
 		interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
 
+		audio_out_off {
+			gpio-hog;
+			gpios = <0 GPIO_ACTIVE_HIGH>; /* P00 */
+			output-high;
+			line-name = "Audio_Out_OFF";
+		};
+
 		hub_pwen {
 			gpio-hog;
 			gpios = <6 GPIO_ACTIVE_HIGH>;
@@ -80,8 +115,16 @@
 			output-high;
 			line-name = "OTG EXTLPn";
 		};
+
+		snd_rst {
+			gpio-hog;
+			gpios = <15 GPIO_ACTIVE_HIGH>; /* P17 */
+			output-high;
+			line-name = "SND_RST";
+		};
 	};
 
+	/* U5 */
 	gpio_exp_75: gpio@75 {
 		compatible = "ti,tca9539";
 		reg = <0x75>;
@@ -98,6 +141,44 @@
 		#size-cells = <0>;
 		reg = <0x71>;
 		reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
+
+		/* Audio_SDA, Audio_SCL */
+		i2c@7 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <7>;
+
+			pcm3168a: audio-codec@44 {
+				#sound-dai-cells = <0>;
+				compatible = "ti,pcm3168a";
+				reg = <0x44>;
+				clocks = <&clksndsel>;
+				clock-names = "scki";
+
+				VDD1-supply	= <&snd_3p3v>;
+				VDD2-supply	= <&snd_3p3v>;
+				VCCAD1-supply	= <&snd_vcc5v>;
+				VCCAD2-supply	= <&snd_vcc5v>;
+				VCCDA1-supply	= <&snd_vcc5v>;
+				VCCDA2-supply	= <&snd_vcc5v>;
+
+				ports {
+					mclk-fs = <512>;
+					port@0 {
+						pcm3168a_endpoint_p: endpoint {
+							remote-endpoint = <&rsnd_for_pcm3168a_play>;
+							clocks = <&clksndsel>;
+						};
+					};
+					port@1 {
+						pcm3168a_endpoint_c: endpoint {
+							remote-endpoint = <&rsnd_for_pcm3168a_capture>;
+							clocks = <&clksndsel>;
+						};
+					};
+				};
+			};
+		};
 	};
 };
 
@@ -173,6 +254,11 @@
 		groups = "usb0";
 		function = "usb0";
 	};
+
+	sound_pcm_pins: sound-pcm {
+		groups = "ssi349_ctrl", "ssi3_data", "ssi4_data";
+		function = "ssi";
+	};
 };
 
 &scif1 {
@@ -193,3 +279,49 @@
 &xhci0 {
 	status = "okay";
 };
+
+&sound_card {
+	dais = <&rsnd_port0	/* ak4613 */
+		&rsnd_port1	/* HDMI0  */
+		&rsnd_port2	/* pcm3168a playback */
+		&rsnd_port3	/* pcm3168a capture  */
+		>;
+};
+
+&rcar_sound {
+	pinctrl-0 = <&sound_pins
+		     &sound_clk_pins
+		     &sound_pcm_pins>;
+
+	ports {
+		/* rsnd_port0/1 are on salvator-common */
+		rsnd_port2: port@2 {
+			rsnd_for_pcm3168a_play: endpoint {
+				remote-endpoint = <&pcm3168a_endpoint_p>;
+
+				dai-format = "i2s";
+				bitclock-master = <&rsnd_for_pcm3168a_play>;
+				frame-master = <&rsnd_for_pcm3168a_play>;
+				dai-tdm-slot-num = <8>;
+
+				playback = <&ssi3>;
+			};
+		};
+		rsnd_port3: port@3 {
+			rsnd_for_pcm3168a_capture: endpoint {
+				remote-endpoint = <&pcm3168a_endpoint_c>;
+
+				dai-format = "i2s";
+				bitclock-master = <&rsnd_for_pcm3168a_capture>;
+				frame-master = <&rsnd_for_pcm3168a_capture>;
+				dai-tdm-slot-num = <6>;
+
+				capture  = <&ssi4>;
+			};
+		};
+	};
+};
+
+&ssi4 {
+	shared-pin;
+};
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 4/8] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
                   ` (2 preceding siblings ...)
  2018-12-26  0:53 ` [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec Kuninori Morimoto
@ 2018-12-26  0:53 ` Kuninori Morimoto
  2018-12-26  0:53 ` [PATCH 5/8] arm64: renesas: r8a7796: " Kuninori Morimoto
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:53 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Before, BUSIF which is needed for DMA transfer was automatically handled
via SSI, but it cared BUSIF0 only.
Now, rsnd driver can handle BUSIF0-7 (= for Gen3) BUSIF0-3 (= for Gen2)
via SSIU, and it is keeping compatibility.
Thus, BUSIF0 settings via SSI had been kept to avoid git merge timing
issue / git bisect issue, but it is no longer needed.
This patch removes it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index af9605d..a81ed2b 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2174,53 +2174,53 @@
 			rcar_sound,ssi {
 				ssi0: ssi-0 {
 					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x01>, <&audma1 0x02>;
+					dma-names = "rx", "tx";
 				};
 				ssi1: ssi-1 {
 					 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x03>, <&audma1 0x04>;
+					dma-names = "rx", "tx";
 				};
 				ssi2: ssi-2 {
 					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x05>, <&audma1 0x06>;
+					dma-names = "rx", "tx";
 				};
 				ssi3: ssi-3 {
 					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x07>, <&audma1 0x08>;
+					dma-names = "rx", "tx";
 				};
 				ssi4: ssi-4 {
 					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x09>, <&audma1 0x0a>;
+					dma-names = "rx", "tx";
 				};
 				ssi5: ssi-5 {
 					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0b>, <&audma1 0x0c>;
+					dma-names = "rx", "tx";
 				};
 				ssi6: ssi-6 {
 					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0d>, <&audma1 0x0e>;
+					dma-names = "rx", "tx";
 				};
 				ssi7: ssi-7 {
 					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0f>, <&audma1 0x10>;
+					dma-names = "rx", "tx";
 				};
 				ssi8: ssi-8 {
 					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x11>, <&audma1 0x12>;
+					dma-names = "rx", "tx";
 				};
 				ssi9: ssi-9 {
 					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x13>, <&audma1 0x14>;
+					dma-names = "rx", "tx";
 				};
 			};
 		};
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 5/8] arm64: renesas: r8a7796: remove BUSIF0 settings from rcar_sound,ssi
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
                   ` (3 preceding siblings ...)
  2018-12-26  0:53 ` [PATCH 4/8] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi Kuninori Morimoto
@ 2018-12-26  0:53 ` Kuninori Morimoto
  2018-12-26  0:53 ` [PATCH 6/8] arm64: renesas: r8a77990-ebisu: use simple-audio-card Kuninori Morimoto
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:53 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Before, BUSIF which is needed for DMA transfer was automatically handled
via SSI, but it cared BUSIF0 only.
Now, rsnd driver can handle BUSIF0-7 (= for Gen3) BUSIF0-3 (= for Gen2)
via SSIU, and it is keeping compatibility.
Thus, BUSIF0 settings via SSI had been kept to avoid git merge timing
issue / git bisect issue, but it is no longer needed.
This patch removes it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index afedbf5..3a9f8c7 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -2110,53 +2110,53 @@
 			rcar_sound,ssi {
 				ssi0: ssi-0 {
 					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x01>, <&audma1 0x02>;
+					dma-names = "rx", "tx";
 				};
 				ssi1: ssi-1 {
 					interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x03>, <&audma1 0x04>;
+					dma-names = "rx", "tx";
 				};
 				ssi2: ssi-2 {
 					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x05>, <&audma1 0x06>;
+					dma-names = "rx", "tx";
 				};
 				ssi3: ssi-3 {
 					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x07>, <&audma1 0x08>;
+					dma-names = "rx", "tx";
 				};
 				ssi4: ssi-4 {
 					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x09>, <&audma1 0x0a>;
+					dma-names = "rx", "tx";
 				};
 				ssi5: ssi-5 {
 					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0b>, <&audma1 0x0c>;
+					dma-names = "rx", "tx";
 				};
 				ssi6: ssi-6 {
 					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0d>, <&audma1 0x0e>;
+					dma-names = "rx", "tx";
 				};
 				ssi7: ssi-7 {
 					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0f>, <&audma1 0x10>;
+					dma-names = "rx", "tx";
 				};
 				ssi8: ssi-8 {
 					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x11>, <&audma1 0x12>;
+					dma-names = "rx", "tx";
 				};
 				ssi9: ssi-9 {
 					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x13>, <&audma1 0x14>;
+					dma-names = "rx", "tx";
 				};
 			};
 
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 6/8] arm64: renesas: r8a77990-ebisu: use simple-audio-card
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
                   ` (4 preceding siblings ...)
  2018-12-26  0:53 ` [PATCH 5/8] arm64: renesas: r8a7796: " Kuninori Morimoto
@ 2018-12-26  0:53 ` Kuninori Morimoto
  2018-12-26  0:54 ` [PATCH 7/8] arm64: defconfig: select Kingfisher Sound related configs Kuninori Morimoto
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:53 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Current Ebisu board is using simple-scu-audio-card
which is used for Sampling Rate Convert, or MIXer, etc.
But, Ebisu is not using such feature.
Then, simple-audio-card is very enough.
This patch fixup it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
index 62bdddc..649d3fd 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts
@@ -159,16 +159,13 @@
 	};
 
 	rsnd_ak4613: sound {
-		compatible = "simple-scu-audio-card";
+		compatible = "simple-audio-card";
 
 		simple-audio-card,name = "rsnd-ak4613";
 		simple-audio-card,format = "left_j";
 		simple-audio-card,bitclock-master = <&sndcpu>;
 		simple-audio-card,frame-master = <&sndcpu>;
 
-		simple-audio-card,prefix = "ak4613";
-		simple-audio-card,routing = "ak4613 Playback", "DAI0 Playback",
-		"DAI0 Capture", "ak4613 Capture";
 		sndcpu: simple-audio-card,cpu {
 			sound-dai = <&rcar_sound>;
 		};
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 7/8] arm64: defconfig: select Kingfisher Sound related configs
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
                   ` (5 preceding siblings ...)
  2018-12-26  0:53 ` [PATCH 6/8] arm64: renesas: r8a77990-ebisu: use simple-audio-card Kuninori Morimoto
@ 2018-12-26  0:54 ` Kuninori Morimoto
  2018-12-26  0:54 ` [PATCH 8/8] arm64: renesas_defconfig: " Kuninori Morimoto
  2018-12-27  1:57 ` [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Simon Horman
  8 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:54 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc


From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch selects PCM3168A which is needed for Kingfisher Sound

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 80c7425..51f536f 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -510,6 +510,7 @@ CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 CONFIG_SND_SOC_SAMSUNG=y
 CONFIG_SND_SOC_RCAR=m
 CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH 8/8] arm64: renesas_defconfig: select Kingfisher Sound related configs
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
                   ` (6 preceding siblings ...)
  2018-12-26  0:54 ` [PATCH 7/8] arm64: defconfig: select Kingfisher Sound related configs Kuninori Morimoto
@ 2018-12-26  0:54 ` Kuninori Morimoto
  2018-12-27  1:57 ` [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Simon Horman
  8 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-26  0:54 UTC (permalink / raw)
  To: Simon, Magnus; +Cc: linux-renesas-soc

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch selects PCA954x, PCM3168A which are missing for
Kingfisher Sound.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm64/configs/renesas_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/configs/renesas_defconfig b/arch/arm64/configs/renesas_defconfig
index 33e6da2..4c7d22a4 100644
--- a/arch/arm64/configs/renesas_defconfig
+++ b/arch/arm64/configs/renesas_defconfig
@@ -128,6 +128,7 @@ CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_MUX=y
+CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_SH_MOBILE=y
 CONFIG_I2C_RCAR=y
@@ -233,6 +234,7 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_RCAR=y
 CONFIG_SND_SOC_AK4613=y
+CONFIG_SND_SOC_PCM3168A_I2C=y
 CONFIG_SND_SIMPLE_CARD=y
 CONFIG_SND_SIMPLE_SCU_CARD=y
 CONFIG_SND_AUDIO_GRAPH_CARD=y
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc
  2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
                   ` (7 preceding siblings ...)
  2018-12-26  0:54 ` [PATCH 8/8] arm64: renesas_defconfig: " Kuninori Morimoto
@ 2018-12-27  1:57 ` Simon Horman
  2018-12-27  2:19   ` Kuninori Morimoto
  8 siblings, 1 reply; 15+ messages in thread
From: Simon Horman @ 2018-12-27  1:57 UTC (permalink / raw)
  To: Kuninori Morimoto; +Cc: Magnus, linux-renesas-soc

On Wed, Dec 26, 2018 at 09:52:36AM +0900, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> ULCB-KF sound is using pcm3168, and it needed driver update
> to use it. Now, necessary patches are applied to linus branch.
> It includes renesas_defconfig,  and Ebisu update (which was already
> posted, but, not yet accepted), too.

Thanks Morimoto-san,

these look good to me but I would like to wait a little before applying
them to allow time for review by others.

> 
> 1) - 5) : For ULCB-KF update
> 6)      : For Ebisu
> 7) - 8) : For defconfig
> 
> Kuninori Morimoto (8):
>   1) arm64: renesas: ulcb: use audio-graph-card
>   2) arm64: renesas: ulcb: add HDMI sound support
>   3) arm64: renesas: ulcb-kf: add pcm3168 sound codec
>   4) arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
>   5) arm64: renesas: r8a7796: remove BUSIF0 settings from rcar_sound,ssi
>   6) arm64: renesas: r8a77990-ebisu: use simple-audio-card
>   7) arm64: defconfig: select Kingfisher Sound related configs
>   8) arm64: renesas_defconfig: select Kingfisher Sound related configs
> 
>  arch/arm64/boot/dts/renesas/r8a7795.dtsi       |  40 ++++----
>  arch/arm64/boot/dts/renesas/r8a7796.dtsi       |  40 ++++----
>  arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts |   5 +-
>  arch/arm64/boot/dts/renesas/ulcb-kf.dtsi       | 132 +++++++++++++++++++++++++
>  arch/arm64/boot/dts/renesas/ulcb.dtsi          |  66 +++++++++----
>  arch/arm64/configs/defconfig                   |   1 +
>  arch/arm64/configs/renesas_defconfig           |   2 +
>  7 files changed, 225 insertions(+), 61 deletions(-)
> 
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc
  2018-12-27  1:57 ` [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Simon Horman
@ 2018-12-27  2:19   ` Kuninori Morimoto
  0 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2018-12-27  2:19 UTC (permalink / raw)
  To: Simon Horman; +Cc: Magnus, linux-renesas-soc


Hi Simon

> > ULCB-KF sound is using pcm3168, and it needed driver update
> > to use it. Now, necessary patches are applied to linus branch.
> > It includes renesas_defconfig,  and Ebisu update (which was already
> > posted, but, not yet accepted), too.
> 
> Thanks Morimoto-san,
> 
> these look good to me but I would like to wait a little before applying
> them to allow time for review by others.

OK, Thanks !

Best regards
---
Kuninori Morimoto

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card
  2018-12-26  0:53 ` [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card Kuninori Morimoto
@ 2019-01-02  9:34   ` Simon Horman
  0 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2019-01-02  9:34 UTC (permalink / raw)
  To: Kuninori Morimoto; +Cc: Magnus, linux-renesas-soc

On Wed, Dec 26, 2018 at 09:53:28AM +0900, Kuninori Morimoto wrote:
> 
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> ULCB can use daughter board which is called as KingFisher.
> It has extra sound interface, thus we want to use it.
> But, basically, ALSA SoC can't use Multiple sound card with single
> CPU sound interface (= SSI). Thus we need to use Single Sound Card
> with multiple DAI interface.
> 
> To be easy to expand ULCB sound card on KingFisher, it is better to
> use multi-dai-link style sound card on ULCB sound DT.
> 
> Now, "simple-audio-card" / "audio-graph-card" both can support
> multi-dai-link style, but HDMI sound support (which is not yet supported
> on ULCB) needs "audio-graph-card".
> Using audio-graph-card is better selection.
> This patch exchange current sound card to use it.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Hi Morimoto-san,

I realise that I previously indicated that I was happy with this series,
but on closer inspection I have found a few minor problems.

1. The prefix of this and all other patches should be
   "arm64: dts: renesas: ". This I can fix when applying,
   but I also see:

2. When compiling with: make W=1 dtbs

  ...

  DTC     arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property

  ...

  Could you please see if this can be resolved?

  Locally I tried s/port@0/port/ which seems to help.

> ---
>  arch/arm64/boot/dts/renesas/ulcb.dtsi | 39 ++++++++++++++++++++---------------
>  1 file changed, 22 insertions(+), 17 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
> index f519d0c..209dda7 100644
> --- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
> +++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
> @@ -83,20 +83,11 @@
>  		regulator-always-on;
>  	};
>  
> -	rsnd_ak4613: sound {
> -		compatible = "simple-audio-card";
> +	sound_card: sound {
> +		compatible = "audio-graph-card";
> +		label = "rcar-sound";
>  
> -		simple-audio-card,format = "left_j";
> -		simple-audio-card,bitclock-master = <&sndcpu>;
> -		simple-audio-card,frame-master = <&sndcpu>;
> -
> -		sndcpu: simple-audio-card,cpu {
> -			sound-dai = <&rcar_sound>;
> -		};
> -
> -		sndcodec: simple-audio-card,codec {
> -			sound-dai = <&ak4613>;
> -		};
> +		dais = <&rsnd_port0>;
>  	};
>  
>  	vcc_sdhi0: regulator-vcc-sdhi0 {
> @@ -211,6 +202,12 @@
>  		asahi-kasei,out4-single-end;
>  		asahi-kasei,out5-single-end;
>  		asahi-kasei,out6-single-end;
> +
> +		port {
> +			ak4613_endpoint: endpoint {
> +				remote-endpoint = <&rsnd_for_ak4613>;
> +			};
> +		};
>  	};
>  
>  	cs2000: clk-multiplier@4f {
> @@ -384,10 +381,18 @@
>  		 <&audio_clk_c>,
>  		 <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
>  
> -	rcar_sound,dai {
> -		dai0 {
> -			playback = <&ssi0 &src0 &dvc0>;
> -			capture  = <&ssi1 &src1 &dvc1>;
> +	ports {
> +		rsnd_port0: port {
> +			rsnd_for_ak4613: endpoint {
> +				remote-endpoint = <&ak4613_endpoint>;
> +
> +				dai-format = "left_j";
> +				bitclock-master = <&rsnd_for_ak4613>;
> +				frame-master = <&rsnd_for_ak4613>;
> +
> +				playback = <&ssi0 &src0 &dvc0>;
> +				capture  = <&ssi1 &src1 &dvc1>;
> +			};
>  		};
>  	};
>  };
> -- 
> 2.7.4
> 

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH 2/8] arm64: renesas: ulcb: add HDMI sound support
  2018-12-26  0:53 ` [PATCH 2/8] arm64: renesas: ulcb: add HDMI sound support Kuninori Morimoto
@ 2019-01-02  9:34   ` Simon Horman
  0 siblings, 0 replies; 15+ messages in thread
From: Simon Horman @ 2019-01-02  9:34 UTC (permalink / raw)
  To: Kuninori Morimoto; +Cc: Magnus, linux-renesas-soc

On Wed, Dec 26, 2018 at 09:53:34AM +0900, Kuninori Morimoto wrote:
> 
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> This patch adds missing ULCB HDMI sound support.
> To use sound card, HDMI video is mandatory.

Hi Morimoto-san,

I realise that I previously indicated that I was happy with this series,
but I have found a, hopefully, minor problem.

When compiling this patch I see:

# make W=1 dtbs
...

  DTC     arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dtb
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@1: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@1: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dtb
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@1: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@1: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dtb
  DTC     arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dtb
  DTC     arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dtb
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@1: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@1: node has a unit name, but no reg property


Locally the following incremental change seems to help.
Could you consider rolling this or a different solution into a v2
of this patchset?


diff --git a/arch/arm64/boot/dts/renesas/ulcb.dtsi b/arch/arm64/boot/dts/renesas/ulcb.dtsi
index 76e128a01b61..065342f6d0dd 100644
--- a/arch/arm64/boot/dts/renesas/ulcb.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb.dtsi
@@ -398,7 +398,12 @@
 		 <&cpg CPG_CORE CPG_AUDIO_CLK_I>;
 
 	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		rsnd_port0: port@0 {
+			reg = <0>;
+
 			rsnd_for_ak4613: endpoint {
 				remote-endpoint = <&ak4613_endpoint>;
 
@@ -411,6 +416,8 @@
 			};
 		};
 		rsnd_port1: port@1 {
+			reg = <1>;
+
 			rsnd_for_hdmi: endpoint {
 				remote-endpoint = <&dw_hdmi0_snd_in>;
 

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec
  2018-12-26  0:53 ` [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec Kuninori Morimoto
@ 2019-01-02  9:35   ` Simon Horman
  2019-01-07  0:54     ` Kuninori Morimoto
  0 siblings, 1 reply; 15+ messages in thread
From: Simon Horman @ 2019-01-02  9:35 UTC (permalink / raw)
  To: Kuninori Morimoto; +Cc: Magnus, linux-renesas-soc

On Wed, Dec 26, 2018 at 09:53:41AM +0900, Kuninori Morimoto wrote:
> 
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> KingFisher has pcm3168 sound codec. This patch enables it.
> Because pcm3168 can't handle symmetric channel on playback/
> capture, we need to handle it as different DAI.

Hi Morimoto-san,

as per my response to other patches in this series I have found,
hopefully, minor problems, when applying this patch.

When compiling I see:
# make W=1 dtbs
...

  DTC     arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dtb
  DTC     arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@1: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@2: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@3: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dtb
  DTC     arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@1: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@2: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@3: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dtb
  DTC     arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@1: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@2: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@3: node has a unit name, but no reg property
  DTC     arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dtb
  DTC     arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@0: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/i2c@e6510000/i2c-switch@71/i2c@7/audio-codec@44/ports/port@1: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@2: node has a unit name, but no reg property
arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dtb: Warning (unit_address_vs_reg): /soc/sound@ec500000/ports/port@3: node has a unit name, but no reg property

Locally the following seems to resolve this problem.
Please consider rolling this incremental change or another fix
into a v2 posting of this patchset.

diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
index 401c166599a2..5cfa193fa8a9 100644
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -163,14 +163,22 @@
 				VCCDA2-supply	= <&snd_vcc5v>;
 
 				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
 					mclk-fs = <512>;
+
 					port@0 {
+						reg = <0>;
+
 						pcm3168a_endpoint_p: endpoint {
 							remote-endpoint = <&rsnd_for_pcm3168a_play>;
 							clocks = <&clksndsel>;
 						};
 					};
+
 					port@1 {
+						reg = <1>;
+
 						pcm3168a_endpoint_c: endpoint {
 							remote-endpoint = <&rsnd_for_pcm3168a_capture>;
 							clocks = <&clksndsel>;
@@ -294,8 +302,13 @@
 		     &sound_pcm_pins>;
 
 	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		/* rsnd_port0/1 are on salvator-common */
 		rsnd_port2: port@2 {
+			reg = <2>;
+
 			rsnd_for_pcm3168a_play: endpoint {
 				remote-endpoint = <&pcm3168a_endpoint_p>;
 
@@ -307,7 +320,10 @@
 				playback = <&ssi3>;
 			};
 		};
+
 		rsnd_port3: port@3 {
+			reg = <3>;
+
 			rsnd_for_pcm3168a_capture: endpoint {
 				remote-endpoint = <&pcm3168a_endpoint_c>;
 

^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec
  2019-01-02  9:35   ` Simon Horman
@ 2019-01-07  0:54     ` Kuninori Morimoto
  0 siblings, 0 replies; 15+ messages in thread
From: Kuninori Morimoto @ 2019-01-07  0:54 UTC (permalink / raw)
  To: Simon Horman; +Cc: Magnus, linux-renesas-soc


Hi Simon

> > KingFisher has pcm3168 sound codec. This patch enables it.
> > Because pcm3168 can't handle symmetric channel on playback/
> > capture, we need to handle it as different DAI.
> 
> Hi Morimoto-san,
> 
> as per my response to other patches in this series I have found,
> hopefully, minor problems, when applying this patch.
> 
> When compiling I see:
> # make W=1 dtbs

Thank you for testing !!
I will fix this issue and post v2

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2019-01-07  0:54 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-26  0:52 [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Kuninori Morimoto
2018-12-26  0:53 ` [PATCH 1/8] arm64: renesas: ulcb: use audio-graph-card Kuninori Morimoto
2019-01-02  9:34   ` Simon Horman
2018-12-26  0:53 ` [PATCH 2/8] arm64: renesas: ulcb: add HDMI sound support Kuninori Morimoto
2019-01-02  9:34   ` Simon Horman
2018-12-26  0:53 ` [PATCH 3/8] arm64: renesas: ulcb-kf: add pcm3168 sound codec Kuninori Morimoto
2019-01-02  9:35   ` Simon Horman
2019-01-07  0:54     ` Kuninori Morimoto
2018-12-26  0:53 ` [PATCH 4/8] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi Kuninori Morimoto
2018-12-26  0:53 ` [PATCH 5/8] arm64: renesas: r8a7796: " Kuninori Morimoto
2018-12-26  0:53 ` [PATCH 6/8] arm64: renesas: r8a77990-ebisu: use simple-audio-card Kuninori Morimoto
2018-12-26  0:54 ` [PATCH 7/8] arm64: defconfig: select Kingfisher Sound related configs Kuninori Morimoto
2018-12-26  0:54 ` [PATCH 8/8] arm64: renesas_defconfig: " Kuninori Morimoto
2018-12-27  1:57 ` [PATCH 0/8] arm64: renesas: Sound update for ULCB/KF, etc Simon Horman
2018-12-27  2:19   ` Kuninori Morimoto

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).