[openwrt/openwrt] ramips: mt7621: create DTSI for ELECOM WRC GS devices with 2 PCI

[LEDE Commits]

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/d0b7e186e622872626dc462162a66fdff826d2bd

commit d0b7e186e622872626dc462162a66fdff826d2bd
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Sat Dec 19 20:16:03 2020 +0100

    ramips: mt7621: create DTSI for ELECOM WRC GS devices with 2 PCI
    
    This creates a dedicated DTSI for ELECOM WRC GS devices with 2 PCI
    WiFi chips in preparation for the 1 chip - dual radio devices, so
    the latter can reuse part of the common definitions.
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts  |  2 +-
 .../linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts |  2 +-
 .../linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts |  2 +-
 .../linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts |  2 +-
 .../ramips/dts/mt7621_elecom_wrc-2533gst2.dts      |  2 +-
 .../ramips/dts/mt7621_elecom_wrc-gs-2pci.dtsi      | 46 ++++++++++++++++++++++
 target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi  | 40 -------------------
 7 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
index 320a15d162..71e4c16ddd 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gs.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "mt7621_elecom_wrc-gs.dtsi"
+#include "mt7621_elecom_wrc-gs-2pci.dtsi"
 
 / {
 	compatible = "elecom,wrc-1750gs", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
index 5d637dc5fe..6719c347f1 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1750gsv.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "mt7621_elecom_wrc-gs.dtsi"
+#include "mt7621_elecom_wrc-gs-2pci.dtsi"
 
 / {
 	compatible = "elecom,wrc-1750gsv", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
index 00a7d5b1e4..675e086a82 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-1900gst.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "mt7621_elecom_wrc-gs.dtsi"
+#include "mt7621_elecom_wrc-gs-2pci.dtsi"
 
 / {
 	compatible = "elecom,wrc-1900gst", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
index 5026778fdc..dacd540b28 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst.dts
@@ -1,4 +1,4 @@
-#include "mt7621_elecom_wrc-gs.dtsi"
+#include "mt7621_elecom_wrc-gs-2pci.dtsi"
 
 / {
 	compatible = "elecom,wrc-2533gst", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
index 1fa2986bc7..a998b61b73 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-2533gst2.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "mt7621_elecom_wrc-gs.dtsi"
+#include "mt7621_elecom_wrc-gs-2pci.dtsi"
 
 / {
 	compatible = "elecom,wrc-2533gst2", "mediatek,mt7621-soc";
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gs-2pci.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gs-2pci.dtsi
new file mode 100644
index 0000000000..642724da10
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gs-2pci.dtsi
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "mt7621_elecom_wrc-gs.dtsi"
+
+&gmac0 {
+	mtd-mac-address = <&factory 0xe000>;
+};
+
+&wan {
+	mtd-mac-address = <&factory 0xe006>;
+};
+
+&state_default {
+	gpio {
+		groups = "uart3", "jtag", "wdt", "sdhci";
+		function = "gpio";
+	};
+};
+
+&pcie0 {
+	wifi at 0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0000 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x0000>;
+		ieee80211-freq-limit = <2400000 2500000>;
+
+		led {
+			led-sources = <0>;
+			led-active-low;
+		};
+	};
+};
+
+&pcie1 {
+	wifi at 0,0 {
+		compatible = "mediatek,mt76";
+		reg = <0x0000 0 0 0 0>;
+		mediatek,mtd-eeprom = <&factory 0x8000>;
+		ieee80211-freq-limit = <5000000 6000000>;
+
+		led {
+			led-sources = <0>;
+			led-active-low;
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi b/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
index fd54ead0bc..790c5fed70 100644
--- a/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
+++ b/target/linux/ramips/dts/mt7621_elecom_wrc-gs.dtsi
@@ -83,16 +83,11 @@
 	};
 };
 
-&gmac0 {
-	mtd-mac-address = <&factory 0xe000>;
-};
-
 &switch0 {
 	ports {
 		wan: port at 0 {
 			status = "okay";
 			label = "wan";
-			mtd-mac-address = <&factory 0xe006>;
 		};
 
 		port at 1 {
@@ -151,45 +146,10 @@
 	};
 };
 
-&state_default {
-	gpio {
-		groups = "uart3", "jtag", "wdt", "sdhci";
-		function = "gpio";
-	};
-};
-
 &pcie {
 	status = "okay";
 };
 
-&pcie0 {
-	wifi at 0,0 {
-		compatible = "mediatek,mt76";
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x0000>;
-		ieee80211-freq-limit = <2400000 2500000>;
-
-		led {
-			led-sources = <0>;
-			led-active-low;
-		};
-	};
-};
-
-&pcie1 {
-	wifi at 0,0 {
-		compatible = "mediatek,mt76";
-		reg = <0x0000 0 0 0 0>;
-		mediatek,mtd-eeprom = <&factory 0x8000>;
-		ieee80211-freq-limit = <5000000 6000000>;
-
-		led {
-			led-sources = <0>;
-			led-active-low;
-		};
-	};
-};
-
 &xhci {
 	status = "disabled";
 };