From 1156b464e225eacd149a405134d46b3fd9649a54 Mon Sep 17 00:00:00 2001
From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 5 Feb 2021 14:15:35 +0100
Subject: [PATCH] arm64: dts: amlogic: Use only meson64_odroidn2.dtb for
 OdroidN2 boards

Switch OdroidN2 board to use meson64_odroidn2.dtb. For Tizen, the DRM
subsystem is enabled for the all Amlogic boards, so there is no need to
have separate dtb with the DRM enabled for OdroidN2 board. This also
fixes DRM support for the OdroidN2+ variant, which use
meson64_odroidn2_plus.dtb, which is based on meson64_odroidn2.dts.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ideeefcaabe5355e59f564abba730e1ad88ea2ce8
---
 arch/arm64/boot/dts/amlogic/Makefile               |  1 -
 arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts   | 19 +++++++++++
 .../boot/dts/amlogic/meson64_odroidn2_drm.dts      | 39 ----------------------
 3 files changed, 19 insertions(+), 40 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts

diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 81034e2..d18eaa5d 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -24,7 +24,6 @@ dtb-$(CONFIG_ARCH_MESON64_ODROIDC4) += meson64_odroidc4.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDC4) += meson64_odroidhc4.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_plus.dtb
-dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_drm.dtb
 
 subdir-$(CONFIG_ARCH_MESON64_ODROIDC4) += overlays/odroidc4
 subdir-$(CONFIG_ARCH_MESON64_ODROIDN2) += overlays/odroidn2
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
index a2a0ea9..4da3b15 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts
@@ -19,6 +19,7 @@
 
 #include "mesong12b_a.dtsi"
 #include "meson64_odroidn2.dtsi"
+#include "mesong12b_drm.dtsi"
 
 / {
 	model = "Hardkernel ODROID-N2";
@@ -146,3 +147,21 @@
 		status = "okay";
 	};
 }; /* end of / */
+
+&meson_fb {
+	status = "disabled";
+};
+
+&drm_vpu {
+	status = "okay";
+	logo_addr = "0x7f800000";
+};
+
+&drm_amhdmitx {
+	status = "okay";
+	hdcp = "disabled";
+};
+
+&drm_lcd {
+	status = "disabled";
+};
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts
deleted file mode 100644
index 6c5aa70..0000000
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/arm64/boot/dts/amlogic/meson64_odroidn2_drm.dts
- *
- * Copyright (C) 2019 Hardkernel Co,. Ltd. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- */
-
-/dts-v1/;
-
-#include "meson64_odroidn2.dts"
-#include "mesong12b_drm.dtsi"
-
-&meson_fb {
-	status = "disabled";
-};
-
-&drm_vpu {
-	status = "okay";
-	logo_addr = "0x7f800000";
-};
-
-&drm_amhdmitx {
-	status = "okay";
-	hdcp = "disabled";
-};
-
-&drm_lcd {
-	status = "disabled";
-};
-- 
2.7.4