From d5f64cca07b65582f3021ef246f226eae6f46bce Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Thu, 2 Mar 2023 12:57:08 +0800
Subject: [PATCH] ipq807x: fix Zyxel Armor G5 (NBG7815) 5.15 kernel

---
 .../arm64/boot/dts/qcom/ipq8074-nbg7815.dts   | 87 ++++++++++---------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/target/linux/ipq807x/files-5.15/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts b/target/linux/ipq807x/files-5.15/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
index 537dd5203..7d5272a5e 100644
--- a/target/linux/ipq807x/files-5.15/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
+++ b/target/linux/ipq807x/files-5.15/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts
@@ -345,53 +345,55 @@
 	status = "okay";
 };
 
-&dp1 {
-	status = "okay";
-	phy-handle = <&qca8075_1>;
-	label = "lan1";
-	nvmem-cells = <&macaddr_lan>;
-	nvmem-cell-names = "mac-address-ascii";
-};
+&soc {
+	dp1: dp1 {
+		status = "okay";
+		phy-handle = <&qca8075_1>;
+		label = "eth0";
+		nvmem-cells = <&macaddr_lan>;
+		nvmem-cell-names = "mac-address-ascii";
+	};
 
-&dp2 {
-	status = "okay";
-	phy-handle = <&qca8075_2>;
-	label = "lan2";
-	nvmem-cells = <&macaddr_lan>;
-	nvmem-cell-names = "mac-address-ascii";
-};
+	dp2: dp2 {
+		status = "okay";
+		phy-handle = <&qca8075_2>;
+		label = "eth1";
+		nvmem-cells = <&macaddr_lan>;
+		nvmem-cell-names = "mac-address-ascii";
+	};
 
-&dp3 {
-	status = "okay";
-	phy-handle = <&qca8075_3>;
-	label = "lan3";
-	nvmem-cells = <&macaddr_lan>;
-	nvmem-cell-names = "mac-address-ascii";
-};
+	dp3: dp3 {
+		status = "okay";
+		phy-handle = <&qca8075_3>;
+		label = "eth2";
+		nvmem-cells = <&macaddr_lan>;
+		nvmem-cell-names = "mac-address-ascii";
+	};
 
-&dp4 {
-	status = "okay";
-	phy-handle = <&qca8075_4>;
-	label = "lan4";
-	nvmem-cells = <&macaddr_lan>;
-	nvmem-cell-names = "mac-address-ascii";
-};
+	dp4: dp4 {
+		status = "okay";
+		phy-handle = <&qca8075_4>;
+		label = "eth3";
+		nvmem-cells = <&macaddr_lan>;
+		nvmem-cell-names = "mac-address-ascii";
+	};
 
-&dp5 {
-	status = "okay";
-	phy-handle = <&qca8081>;
-	label = "wan";
-	nvmem-cells = <&macaddr_lan>;
-	nvmem-cell-names = "mac-address-ascii";
-	mac-address-increment = <1>;
-};
+	dp5: dp5 {
+		status = "okay";
+		phy-handle = <&qca8081>;
+		label = "eth4";
+		nvmem-cells = <&macaddr_lan>;
+		nvmem-cell-names = "mac-address-ascii";
+		mac-address-increment = <1>;
+	};
 
-&dp6_syn {
-	status = "okay";
-	phy-handle = <&aqr113c>;
-	label = "10g";
-	nvmem-cells = <&macaddr_lan>;
-	nvmem-cell-names = "mac-address-ascii";
+	dp6: dp6_syn {
+		status = "okay";
+		phy-handle = <&aqr113c>;
+		label = "eth5";
+		nvmem-cells = <&macaddr_lan>;
+		nvmem-cell-names = "mac-address-ascii";
+	};
 };
 
 &blsp1_i2c2 {
@@ -411,7 +413,6 @@
 	/delete-property/ mmc-hs400-1_8v;
 	mmc-hs200-1_8v;
 	mmc-ddr-1_8v;
-	vqmmc-supply = <&l11>;
 };
 
 &ssphy_0 {