From b663de2fe6d234794cd11843ae1cacdc9de2f40e Mon Sep 17 00:00:00 2001
From: Chris <codewalker@hardkernel.com>
Date: Tue, 25 Oct 2022 12:47:47 +0900
Subject: [PATCH] ODROID-N2L: Fix for meson64_odroidn2l_android

Change-Id: I3cd142446b5cb69d0629f66125b0c8020f09272f
---
 MAINTAINERS                                   |  3 +-
 arch/arm64/boot/dts/amlogic/Makefile          |  1 +
 .../dts/amlogic/meson64_odroidn2l_android.dts | 42 +++++++++++++++++++
 .../overlays/odroidn2/odroidn2l-opp.dts       | 22 ----------
 4 files changed, 45 insertions(+), 23 deletions(-)
 create mode 100644 arch/arm64/boot/dts/amlogic/meson64_odroidn2l_android.dts

diff --git a/MAINTAINERS b/MAINTAINERS
index 5723f8f6ebb7..a3c5d2e74aa5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15256,6 +15256,7 @@ LT8619C-QC4011 DRIVER
 M:	Chris KIM <codewalker@hardkenrle.com>
 F:	drivers/amlogic/bridge/
 
-DTS OVERLAY FOR ODROID-N2 LITE
+DTS OVERLAY FOR ODROID-N2L
 M:	Chris KIM <codewalker@hardkenrle.com>
 F:	arch/arm64/boot/dts/amlogic/overlays/odroidn2/odroidn2l-opp.dts
+F:	arch/arm64/boot/dts/amlogic/meson64_odroidn2l_android.dts
diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 50f222311003..2bba4042aed9 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -12,6 +12,7 @@ dtb-$(CONFIG_ARCH_MESON64_ODROIDC4) += meson64_odroidhc4.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDC4) += meson64_odroidhc4_android.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2.dtb
 dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_android.dtb
+dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2l_android.dtb
 
 subdir-$(CONFIG_ARCH_MESON64_ODROIDC4) := overlays/odroidc4
 subdir-$(CONFIG_ARCH_MESON64_ODROIDN2) := overlays/odroidn2
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2l_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2l_android.dts
new file mode 100644
index 000000000000..2cd6b3f0d38e
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2l_android.dts
@@ -0,0 +1,42 @@
+/*
+ * arch/arm64/boot/dts/amlogic/meson64_odroidn2l_android.dts
+ *
+ * Copyright (C) 2018 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.
+ *
+ */
+
+#include "meson64_odroidn2_android.dts"
+
+/ {
+	/delete-node/ gpio-reset;
+};
+
+&odroid_hdmi {
+	/delete-property/ mute_gpio;
+};
+
+&ethmac {
+	status = "disabled";
+};
+
+&i2c3 {
+	status = "disabled";
+};
+
+&usb3_phy_v2 {
+	status = "disabled";
+};
+
+&dwc2_a {
+	status = "disabled";
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/odroidn2l-opp.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/odroidn2l-opp.dts
index e67ac350b22d..dc66b00bc88e 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/odroidn2l-opp.dts
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/odroidn2l-opp.dts
@@ -136,7 +136,6 @@
 				opp-microvolt = <1040000>;
 			};
 		};
-		/delete-node/ gpio-reset;
 	};
 
 	fragment@2 {
@@ -150,25 +149,4 @@
 		};
 	};
 
-	fragment@3 {
-		target = <&ethmac>;
-		__overlay__ {
-			status = "disabled";
-		};
-	};
-
-	fragment@4 {
-		target = <&dwc2_a>;
-		__overlay__{
-			status = "disabled";
-		};
-	};
-
-	fragment@5 {
-		target = <&usb3_phy_v2>;
-		__overlay__{
-			status = "disabled";
-		};
-	};
-
 };