From dece2dee0884c279e0994c3e05e293e2ac404dfc Mon Sep 17 00:00:00 2001
From: Tonymac32 <tonymckahan@gmail.com>
Date: Mon, 20 Nov 2017 00:05:44 -0500
Subject: [PATCH] Meson64-GX patches NanoPi K2

HDMI DT entry to enable HDMI port
ATF reserved memory patch
---
 ...011_Meson-GX_ATF_reserved_Memory_Fix.patch | 16 +++++++
 .../meson64-next/1020_NanoPi_K2_HDMI.patch    | 42 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 patch/kernel/meson64-next/1011_Meson-GX_ATF_reserved_Memory_Fix.patch
 create mode 100644 patch/kernel/meson64-next/1020_NanoPi_K2_HDMI.patch

diff --git a/patch/kernel/meson64-next/1011_Meson-GX_ATF_reserved_Memory_Fix.patch b/patch/kernel/meson64-next/1011_Meson-GX_ATF_reserved_Memory_Fix.patch
new file mode 100644
index 000000000..72515d904
--- /dev/null
+++ b/patch/kernel/meson64-next/1011_Meson-GX_ATF_reserved_Memory_Fix.patch
@@ -0,0 +1,16 @@
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+index 4218110..36944f8 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
++++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+@@ -71,6 +71,11 @@
+ 			reg = <0x0 0x10000000 0x0 0x200000>;
+ 			no-map;
+ 		};
++		/* Alternate 3 MiB reserved for ARM Trusted Firmware (BL31) */
++		secmon_reserved_alt: secmon@05000000 {
++			reg = <0x0 0x05000000 0x0 0x300000>;
++			no-map;
++		};
+ 
+ 		linux,cma {
+ 			compatible = "shared-dma-pool";
diff --git a/patch/kernel/meson64-next/1020_NanoPi_K2_HDMI.patch b/patch/kernel/meson64-next/1020_NanoPi_K2_HDMI.patch
new file mode 100644
index 000000000..a0cc63a89
--- /dev/null
+++ b/patch/kernel/meson64-next/1020_NanoPi_K2_HDMI.patch
@@ -0,0 +1,42 @@
+diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+index fa46283..3cf4cde 100644
+--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
++++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+@@ -141,6 +141,18 @@
+ 		compatible = "mmc-pwrseq-emmc";
+ 		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
+ 	};
++
++	hdmi-connector {
++		compatible = "hdmi-connector";
++		type = "a";
++
++		port {
++			hdmi_connector_in: endpoint {
++				remote-endpoint = <&hdmi_tx_tmds_out>;
++			};
++		};
++	};
++
+ };
+ 
+ &ethmac {
+@@ -169,6 +181,18 @@
+ 	};
+ };
+ 
++
++&hdmi_tx {
++	status = "okay";
++	pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
++	pinctrl-names = "default";
++};
++
++&hdmi_tx_tmds_port {
++	hdmi_tx_tmds_out: endpoint {
++		remote-endpoint = <&hdmi_connector_in>;
++	};
++};
+ &ir {
+ 	status = "okay";
+ 	pinctrl-0 = <&remote_input_ao_pins>;