[PATCH] arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

[PATCH] arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

[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-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>
Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Cc: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
Cc: Klaus Goger <klaus.goger-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>
---
 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
index 7d3e8bfd51dd..23c59c8f0775 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -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";
+};
-- 
2.11.0

[PATCH] arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

[Vicente Bergas]

Hello Jakob,

On 2018-04-24 16:24, Jakob Unterwurzacher wrote:
>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(+)
>
>diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
>index 7d3e8bfd51dd..23c59c8f0775 100644
>--- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
>+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
>@@ -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";
>+};
>-- 
>2.11.0

Does HDMI audio work on rk3399-puma-haikou?

Regards,
  Vicente.

Re: [PATCH] arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

[Jakob Unterwurzacher]

On 30.04.18 20:51, Vicente Bergas wrote:
> 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

Re: [PATCH] arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

[Vicente Bergas]

Hi,

On Wed, May 2, 2018 at 4:19 PM, Jakob Unterwurzacher
<jakob.unterwurzacher-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org> wrote:
> On 30.04.18 20:51, Vicente Bergas wrote:
>>
>> 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
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -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.

Re: [PATCH] arm64: dts: rockchip: enable hdmi on rk3399-puma-haikou

[Heiko Stuebner]

Am Dienstag, 24. April 2018, 16:24:59 CEST schrieb 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-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>
> Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>
> Cc: Klaus Goger <klaus.goger-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>
> ---

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