From 1039f705fb7199d620368f7374db2ef537d67dd8 Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Tue, 1 Sep 2020 16:40:19 +0200
Subject: [PATCH] main/linux-postmarketos-allwinner: hotfix for hdmi output (MR
 1524)

Sloppy patch that makes the displayport alt-mode output signal work on
the PinePhone convergence edition. Proper fix is in the 5.8 tree

[ci:skip-build]: Martijn made sure that it builds and works. This is
		 time critical, so skip the CI build.
---
 main/linux-postmarketos-allwinner/APKBUILD    |  6 ++--
 .../convergence.patch                         | 35 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 main/linux-postmarketos-allwinner/convergence.patch

diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD
index d01eee439..2ff39ebbe 100644
--- a/main/linux-postmarketos-allwinner/APKBUILD
+++ b/main/linux-postmarketos-allwinner/APKBUILD
@@ -2,7 +2,7 @@ _flavor=postmarketos-allwinner
 _config="config-$_flavor.$CARCH"
 pkgname=linux-$_flavor
 pkgver=5.7.0_git20200705
-pkgrel=1
+pkgrel=2
 arch="aarch64"
 pkgdesc="Kernel fork with Pine64 patches"
 url="https://gitlab.com/pine64-org/linux/"
@@ -14,6 +14,7 @@ source="$pkgname-$_commit.tar.gz::https://gitlab.com/pine64-org/linux/-/archive/
 	config-$_flavor.aarch64
 	disable-power-save.patch
 	touch-dts.patch
+	convergence.patch
 	"
 
 subpackages="$pkgname-dev"
@@ -67,4 +68,5 @@ dev() {
 sha512sums="3655b68deffcdd2384f900354695098d85a646ef55b581406d734ef27511f3cc6bd5084b5524955ca3536aed38375f07f0500d465faeb162cd13fd220281a494  linux-postmarketos-allwinner-c3e42484fd1be12ef573bc77f91626ccb7efd1ad.tar.gz
 3a77fb1493fa82760cecfb1a6c1496da03bec2b24feaef4f950f08e50b9fc0ef5b5f2c11b1bbef192fd0a1d7298e92032c1931ceb44e752eef33b0822514b04d  config-postmarketos-allwinner.aarch64
 3c0d9d282a36a5f6a442b434839d77851f9b20185725cb73aee88e6e209c68fd3d71df8e2a36ffcdb605c47f86df5dbcda5d00353c75c23303861936196924e0  disable-power-save.patch
-c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch"
+c6e1ff1c060f68a59fa57a7cfc573a500fc8d200f56193530f7c1967e4f70f17cb2c930496f6a6489a6a10de130a2e66f5cd328eb6c4ae936f4af348a7413c3b  touch-dts.patch
+ace7821ed3f31681aaf8cc983df155f98c01343d908cec1d32fcfd28999bbd9727ecca173a4b31026c966c6bf762f60549c3b09f7d7f8de74900271a7ad78d1a  convergence.patch"
diff --git a/main/linux-postmarketos-allwinner/convergence.patch b/main/linux-postmarketos-allwinner/convergence.patch
new file mode 100644
index 000000000..851554bbd
--- /dev/null
+++ b/main/linux-postmarketos-allwinner/convergence.patch
@@ -0,0 +1,35 @@
+Sloppy patch that makes the displayport alt-mode output signal work on
+the PinePhone convergence edition. Proper fix is in the 5.8 tree
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+index 1c555456be1e..2cd3b7bd4175 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+@@ -712,3 +712,27 @@ usb0_drd_sw: endpoint {
+ 		};
+ 	};
+ };
++
++&hdmi {
++	hvcc-supply = <&reg_dldo1>;
++	status = "okay";
++};
++
++&hdmi_out {
++	hdmi_out_con: endpoint {
++		remote-endpoint = <&hdmi_con_in>;
++	};
++};
++
++/ {
++	hdmi-connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_con_in: endpoint {
++				remote-endpoint = <&hdmi_out_con>;
++			};
++		};
++	};
++};