From 6df341b33cce0128557d274dc5511a051ceec483 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Wed, 28 Apr 2021 13:04:55 +0800
Subject: [PATCH] ramips: xiaomi cr6606: typo fixes (#6770)

---
 .../dts/mt7621_xiaomi_mi-router-cr6606.dts    | 15 ++++++-------
 target/linux/ramips/image/mt7621.mk           | 21 ++++---------------
 .../mt7621/base-files/etc/board.d/01_leds     |  2 +-
 .../mt7621/base-files/etc/board.d/02_network  |  1 -
 4 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
index 896c0f6a2..f39936b71 100644
--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
+++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-cr6606.dts
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
 
 #include "mt7621.dtsi"
 
@@ -8,7 +9,7 @@
 / {
 	compatible = "xiaomi,mi-router-cr6606", "mediatek,mt7621-soc";
 	model = "Xiaomi Mi Router CR6606";
-	
+
 	aliases {
 		led-boot = &led_sys_yellow;
 		led-failsafe = &led_sys_yellow;
@@ -25,22 +26,22 @@
 		compatible = "gpio-leds";
 
 		led_sys_yellow: sys_yellow {
-			label = "yellow:sys";
+			label = "mi-router-cr6606:yellow:sys";
 			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
 		};
 
 		led_sys_blue: sys_blue {
-			label = "blue:sys";
+			label = "mi-router-cr6606:blue:sys";
 			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
 		};
 
 		net_yellow {
-			label = "yellow:net";
+			label = "mi-router-cr6606:yellow:net";
 			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
 		};
 
 		net_blue {
-			label = "blue:net";
+			label = "mi-router-cr6606:blue:net";
 			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
 		};
 	};
@@ -127,7 +128,7 @@
 		partition@7000000 {
 			label = "obr";
 			reg = <0x7000000 0x1000000>;
-            read-only;
+			read-only;
 		};
 	};
 };
@@ -184,4 +185,4 @@
 		groups = "jtag", "uart3", "wdt";
 		function = "gpio";
 	};
-};
\ No newline at end of file
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 50a26024f..40bfc7051 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1065,8 +1065,6 @@ define Device/xiaomi_mir4
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
   DEVICE_VENDOR := Xiaomi
   DEVICE_MODEL := Mi Router 4
-  SUPPORTED_DEVICES += R4
-  SUPPORTED_DEVICES += mir4
   DEVICE_PACKAGES := kmod-mt7603e kmod-mt76x2e luci-app-mtwifi uboot-envtools
 endef
 TARGET_DEVICES += xiaomi_mir4
@@ -1094,29 +1092,18 @@ endef
 TARGET_DEVICES += xiaomi_mi-router-ac2100
 
 define Device/xiaomi_mi-router-cr6606
-  $(Device/dsa-migration)
   $(Device/uimage-lzma-loader)
-  DEVICE_VENDOR := Xiaomi
-  DEVICE_MODEL := Mi Router CR6606
-  DEVICE_ALT0_VENDOR := Xiaomi
-  DEVICE_ALT0_MODEL := Mi Router CR6606
-  DEVICE_ALT0_VARIANT := China Unicom
-  DEVICE_ALT1_VENDOR := Xiaomi
-  DEVICE_ALT1_MODEL := Mi Router CR6608
-  DEVICE_ALT1_VARIANT := China Mobile
-  DEVICE_ALT2_VENDOR := Xiaomi
-  DEVICE_ALT2_MODEL := Mi Router CR6609
-  DEVICE_ALT2_VARIANT := China Telecom
   BLOCKSIZE := 128k
   PAGESIZE := 2048
   UBINIZE_OPTS := -E 5
   IMAGE_SIZE := 51200k
   IMAGES += firmware.bin overlay.bin
-  IMAGE/firmware.bin := append-kernel | pad-to 128k | append-rootfs | \
-  pad-rootfs
+  IMAGE/firmware.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs
   IMAGE/overlay.bin := append-ubi | check-size
   IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
-  DEVICE_PACKAGES += uboot-envtools kmod-mt7915e
+  DEVICE_VENDOR := Xiaomi
+  DEVICE_MODEL := Mi Router CR6606
+  DEVICE_PACKAGES += uboot-envtools kmod-mt7915e wpad-openssl
 endef
 TARGET_DEVICES += xiaomi_mi-router-cr6606
 
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index f7a64f1c3..dd57254e1 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -95,7 +95,7 @@ xiaomi,mi-router-ac2100)
 	ucidef_set_led_switch "wan" "wan" "$boardname:blue:wan" "switch0" "0x1"
 	;;
 xiaomi,mi-router-cr6606)
-	ucidef_set_led_netdev "internet" "internet" "blue:net" "wan"
+	ucidef_set_led_netdev "internet" "internet" "mi-router-cr6606:blue:net" "wan"
 	;;
 xiaomi,redmi-router-ac2100)
 	ucidef_set_led_switch "wan" "wan" "$boardname:white:wan" "switch0" "0x1"
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
index b8e28e7e4..5f1e371c1 100755
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -90,7 +90,6 @@ ramips_setup_interfaces()
 		ucidef_set_interface_lan "eth0.1 ra0 rai0"
 		;;
 	xiaomi,mi-router-ac2100|\
-	xiaomi,mi-router-cr6606|\
 	xiaomi,redmi-router-ac2100)
 		ucidef_add_switch "switch0" \
 			"0:wan" "2:lan:1" "3:lan:2" "4:lan:3" "6@eth0"