[openwrt/openwrt] mediatek: new target mt7622-ubnt-unifi-6-lr-v1

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/8f0d8869d536f1a9c1dce25f37753900d253df3c

commit 8f0d8869d536f1a9c1dce25f37753900d253df3c
Author: Henrik Riomar <henrik.riomar at gmail.com>
AuthorDate: Tue May 31 19:18:06 2022 +0200

    mediatek: new target mt7622-ubnt-unifi-6-lr-v1
    
    Based on current mt7622-ubnt-unifi-6-lr, this is a preparation for
    adding a v2 version of this target
    
    * v1 - with led-bar
    * v2 - two simple GPIO connected LEDs (in later commits)
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
    [added SUPPORTED_DEVICES for compatibility with existing setups]
    Signed-off-by: Henrik Riomar <henrik.riomar at gmail.com>
    (cherry picked from commit 15a02471bb854245f8f94398c1e1d9ce29c2c341)
---
 .../dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts        |  2 +-
 ...nifi-6-lr.dts => mt7622-ubnt-unifi-6-lr-v1.dts} |  4 ++--
 .../mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi    | 27 ++++++++++++++++++++++
 .../linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi | 25 --------------------
 target/linux/mediatek/image/mt7622.mk              |  8 ++++---
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts
index e573d30912..8a9d0a1887 100644
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-ubootmod.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "mt7622-ubnt-unifi-6-lr.dtsi"
+#include "mt7622-ubnt-unifi-6-lr-v1.dtsi"
 
 / {
 	model = "Ubiquiti UniFi 6 LR (U-Boot mod)";
diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts
similarity index 95%
rename from target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts
rename to target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts
index 9b676b43c1..d0048d4715 100644
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dts
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dts
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "mt7622-ubnt-unifi-6-lr.dtsi"
+#include "mt7622-ubnt-unifi-6-lr-v1.dtsi"
 
 / {
-	model = "Ubiquiti UniFi 6 LR";
+	model = "Ubiquiti UniFi 6 LR v1";
 	compatible = "ubnt,unifi-6-lr", "mediatek,mt7622";
 };
 
diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi
new file mode 100644
index 0000000000..8f15d3f110
--- /dev/null
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr-v1.dtsi
@@ -0,0 +1,27 @@
+#include "mt7622-ubnt-unifi-6-lr.dtsi"
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins>;
+	status = "okay";
+
+	led-controller at 30 {
+		compatible = "ubnt,ledbar";
+		reg = <0x30>;
+
+		enable-gpio = <&pio 59 0>;
+
+		red {
+			label = "red";
+		};
+
+		green {
+			label = "green";
+		};
+
+		led_blue: blue {
+			label = "blue";
+		};
+	};
+};
+
diff --git a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi
index f7881af624..4231cc1f79 100644
--- a/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi
+++ b/target/linux/mediatek/dts/mt7622-ubnt-unifi-6-lr.dtsi
@@ -223,31 +223,6 @@
 	/* MT7915 Bluetooth */
 };
 
-&i2c0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c0_pins>;
-	status = "okay";
-
-	led-controller at 30 {
-		compatible = "ubnt,ledbar";
-		reg = <0x30>;
-
-		enable-gpio = <&pio 59 0>;
-
-		red {
-			label = "red";
-		};
-
-		green {
-			label = "green";
-		};
-
-		led_blue: blue {
-			label = "blue";
-		};
-	};
-};
-
 &watchdog {
 	pinctrl-names = "default";
 	pinctrl-0 = <&watchdog_pins>;
diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk
index 39bc7bc2ea..ea5ebdd410 100644
--- a/target/linux/mediatek/image/mt7622.mk
+++ b/target/linux/mediatek/image/mt7622.mk
@@ -222,15 +222,17 @@ define Device/totolink_a8000ru
 endef
 TARGET_DEVICES += totolink_a8000ru
 
-define Device/ubnt_unifi-6-lr
+define Device/ubnt_unifi-6-lr-v1
   DEVICE_VENDOR := Ubiquiti
   DEVICE_MODEL := UniFi 6 LR
+  DEVICE_VARIANT := v1
   DEVICE_DTS_CONFIG := config at 1
-  DEVICE_DTS := mt7622-ubnt-unifi-6-lr
+  DEVICE_DTS := mt7622-ubnt-unifi-6-lr-v1
   DEVICE_DTS_DIR := ../dts
   DEVICE_PACKAGES := kmod-mt7915e kmod-leds-ubnt-ledbar
+  SUPPORTED_DEVICES += ubnt,unifi-6-lr
 endef
-TARGET_DEVICES += ubnt_unifi-6-lr
+TARGET_DEVICES += ubnt_unifi-6-lr-v1
 
 define Device/ubnt_unifi-6-lr-ubootmod
   DEVICE_VENDOR := Ubiquiti