[PATCH 1/2] arm64: dts: rockchip: connect hdmi sound in rk3399

[PATCH 1/2] arm64: dts: rockchip: connect hdmi sound in rk3399

[Vicente Bergas]

Everything is in place and working, it only needed to be wired up.

Signed-off-by: Vicente Bergas <vicencb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 arch/arm64/boot/dts/rockchip/rk3399.dtsi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 4550c0f82be9..efb3a4481792 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -1537,6 +1537,7 @@
 	};
 
 	i2s2: i2s@ff8a0000 {
+		#sound-dai-cells = <0>;
 		compatible = "rockchip,rk3399-i2s", "rockchip,rk3066-i2s";
 		reg = <0x0 0xff8a0000 0x0 0x1000>;
 		interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH 0>;
@@ -1682,7 +1683,25 @@
 		status = "disabled";
 	};
 
+	hdmi_sound: hdmi-sound {
+		status = "disabled";
+		compatible = "simple-audio-card";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,mclk-fs = <256>;
+		simple-audio-card,name = "hdmi-sound";
+
+		simple-audio-card,cpu {
+			sound-dai = <&i2s2>;
+		};
+		simple-audio-card,codec {
+			sound-dai = <&hdmi>;
+		};
+	};
+
 	hdmi: hdmi@ff940000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		#sound-dai-cells = <0>;
 		compatible = "rockchip,rk3399-dw-hdmi";
 		reg = <0x0 0xff940000 0x0 0x20000>;
 		interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH 0>;
-- 
2.17.1

[PATCH 2/2] arm64: dts: rockchip: sapphire: enable hdmi sound

[Vicente Bergas]

Signed-off-by: Vicente Bergas <vicencb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index e5daed7d2026..38f05d722968 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -227,6 +227,10 @@
 	status = "okay";
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &i2c0 {
 	clock-frequency = <400000>;
 	i2c-scl-rising-time-ns = <168>;
-- 
2.17.1

Re: [PATCH 2/2] arm64: dts: rockchip: sapphire: enable hdmi sound

[Heiko Stübner]

Am Sonntag, 3. Juni 2018, 00:07:18 CEST schrieb Vicente Bergas:
> Signed-off-by: Vicente Bergas <vicencb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

applied for 4.19, after giving the patch a simple commit message.


Thanks
Heiko

Re: [PATCH 1/2] arm64: dts: rockchip: connect hdmi sound in rk3399

[Heiko Stübner]

Am Sonntag, 3. Juni 2018, 00:07:17 CEST schrieb Vicente Bergas:
> Everything is in place and working, it only needed to be wired up.
> 
> Signed-off-by: Vicente Bergas <vicencb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

applied for 4.19 after moving the #sound-dai-cells further down,
same for the status in hdmi_sound and removing the newly added
address-cells+size-cells from the patch.


Thanks
Heiko