Skip to contentSkip to conversation

arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

PATCH In review Jakob Unterwurzacher 3 participants 5 messages Apr 24, 2018 – May 3, 2018 3 messages not in the archive

Subsystems (2)
Device tree bindings Arm Rockchip
lore
Share & tools
lore

Jakob Unterwurzacher

author
#0 lore raw

PATCH 1/1 arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

Earlier kernels showed a corrupt image on hdmi, on v4.16 things work fine at resolutions up to 1920x1080.

On v4.17-rc2 two fixes are pending for hdmi to work:

1) "iommu/rockchip: make clock handling optional"
https://patchwork.kernel.org/patch/10344875/

2) Add missing enable_irq in rockchip_drm_vop.c
http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html

These should get merged soon, so I think it's time to enable the hdmi output in our dts.

Signed-off-by Jakob Unterwurzacher <jakob.unterwurzacher-SN7IsUiht6C/[email protected]>
Cc [email protected]
Cc Heiko Stuebner <[email protected]>
Cc Klaus Goger <klaus.goger-SN7IsUiht6C/[email protected]>
---
 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +21 -0
index 7d3e8bfd51dd..23c59c8f0775 100644
@@ -143,6 +143,11 @@
 	};
 };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c3>;
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 	clock-frequency = <400000>;

@@ -281,3 +286,19 @@
 &usb_host0_ohci {
 	status = "okay";
 };
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
Signature · 1 line
2.11.0

A message that is not in the archive (sent off-list or not yet received): 20180424142459.3339-1-jakob.unterwurzacher-SN7IsUiht6C/[email protected]

#2 lore raw

PATCH 1/1 arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

Hello Jakob,

Quoted 60 lines · Jakob Unterwurzacher

Earlier kernels showed a corrupt image on hdmi, on v4.16 things work fine at resolutions up to 1920x1080.

On v4.17-rc2 two fixes are pending for hdmi to work:

1) "iommu/rockchip: make clock handling optional"
https://patchwork.kernel.org/patch/10344875/

2) Add missing enable_irq in rockchip_drm_vop.c
http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html

These should get merged soon, so I think it's time to enable the hdmi output in our dts.

Signed-off-by Jakob Unterwurzacher <jakob.unterwurzacher at theobroma-systems.com>
Cc linux-rockchip at lists.infradead.org
Cc Heiko Stuebner <heiko at sntech.de>
Cc Klaus Goger <klaus.goger at theobroma-systems.com>

---
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +21 -0
index 7d3e8bfd51dd..23c59c8f0775 100644
@@ -143,6 +143,11 @@
 	};
 };
 
+&hdmi {
+	ddc-i2c-bus = <&i2c3>;
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 	clock-frequency = <400000>;

@@ -281,3 +286,19 @@
 &usb_host0_ohci {
 	status = "okay";
 };
+
+&vopb {
+	status = "okay";
+};
+
+&vopb_mmu {
+	status = "okay";
+};
+
+&vopl {
+	status = "okay";
+};
+
+&vopl_mmu {
+	status = "okay";
+};
Signature · 1 line
2.11.0

Does HDMI audio work on rk3399-puma-haikou?

Regards,
Vicente.

A message that is not in the archive (sent off-list or not yet received): 20180430185107.3197-1-vicencb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

author
#4 lore raw
Quoted 1 line · Vicente Bergas

Does HDMI audio work on rk3399-puma-haikou?

Hi Vicente, works on v4.4 vendor kernel, but does not seem to work on mainline.

Best regards,
Jakob

A message that is not in the archive (sent off-list or not yet received): d32fa12f-ceb8-a869-2450-0df5cb4086ff-SN7IsUiht6C/[email protected]

#6 lore raw

Hi,

Quoted 10 lines · Jakob Unterwurzacher
Quoted 2 lines · Vicente Bergas

Does HDMI audio work on rk3399-puma-haikou?

Hi Vicente, works on v4.4 vendor kernel, but does not seem to work on mainline.

Best regards,
Jakob

just for reference, this is what I tested:
1.- enable CONFIG_SND_SIMPLE_CARD in the kernel configuration 2.- patch rk3399-sapphire.dtsi with

arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +14 -0
@@ -119,6 +119,19 @@
         };
     };
 
+    sapphire-sound {
+        compatible = "simple-audio-card";
+        simple-audio-card,name = "rockchip,sapphire-codec";
+        simple-audio-card,format = "i2s";
+        simple-audio-card,mclk-fs = <256>;
+        simple-audio-card,cpu {
+            sound-dai = <&i2s2>;
+        };
+        simple-audio-card,codec {
+            sound-dai = <&hdmi>;
+        };
+    };
+
     /* switched by pmic_sleep */
     vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
         compatible = "regulator-fixed";

@@ -223,6 +246,7 @@
 };
 
 &hdmi {
+    #sound-dai-cells = <0>;
     ddc-i2c-bus = <&i2c3>;
     status = "okay";
 };

But I am always getting:
ALSA device list:
No soundcards found.

Regards,
Vicente.

#7 lore raw
In reply to a message not in the archive

Am Dienstag, 24. April 2018, 16:24:59 CEST schrieb Jakob Unterwurzacher:

Quoted 11 lines

Earlier kernels showed a corrupt image on hdmi, on v4.16 things work fine at resolutions up to 1920x1080.

On v4.17-rc2 two fixes are pending for hdmi to work:

1) "iommu/rockchip: make clock handling optional"
https://patchwork.kernel.org/patch/10344875/

2) Add missing enable_irq in rockchip_drm_vop.c
http://lists.infradead.org/pipermail/linux-rockchip/2018-April/020427.html

Quoted 8 lines

These should get merged soon, so I think it's time to enable the hdmi output in our dts.

Signed-off-by Jakob Unterwurzacher <jakob.unterwurzacher-SN7IsUiht6C/[email protected]>
Cc [email protected]
Cc Heiko Stuebner <[email protected]>
Cc Klaus Goger <klaus.goger-SN7IsUiht6C/[email protected]>

---

Devicetree support should be independent of actual kernel features, so it's not really necessary to list kernel-specific changes. Instead I just shortened the message to
"The Puma-haikou combo supports hdmi output, so enable the hdmi controller and vop controllers on it."

and applied it for 4.18

Thanks
Heiko