From 1cbb64a529e0ca36422732ccfc3aa5a2e1e2e6bd Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Sun, 15 Nov 2020 18:12:29 +0800
Subject: [PATCH] Revert "ramips: add support for D-Link DIR-2640 A1"

This reverts commit 79d61469322a7f9da16d5b8ec1045af68bc81dea

Fixes: TG#200012
---
 .../ramips/dts/mt7621_dlink_dir-2640-a1.dts   | 34 -------------------
 target/linux/ramips/image/mt7621.mk           |  7 ----
 .../mt7621/base-files/etc/board.d/01_leds     |  1 -
 .../mt7621/base-files/lib/upgrade/platform.sh |  1 -
 4 files changed, 43 deletions(-)
 delete mode 100644 target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
deleted file mode 100644
index 323a790600..0000000000
--- a/target/linux/ramips/dts/mt7621_dlink_dir-2640-a1.dts
+++ /dev/null
@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include "mt7621_dlink_dir-xx60-a1.dtsi"
-
-/ {
-	compatible = "dlink,dir-2640-a1", "mediatek,mt7621-soc";
-	model = "D-Link DIR-2640 A1";
-};
-
-&leds {
-	usb2_white {
-		label = "white:usb2";
-		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-		trigger-sources = <&ehci_port2>;
-		linux,default-trigger = "usbport";
-	};
-
-	usb3_white {
-		label = "white:usb3";
-		gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-		trigger-sources = <&xhci_ehci_port1>;
-		linux,default-trigger = "usbport";
-	};
-};
-
-&wifi0 {
-	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <1>;
-};
-
-&wifi1 {
-	mtd-mac-address = <&factory 0xe000>;
-	mtd-mac-address-increment = <2>;
-};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 9a52b52c6a..97b378d1b9 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -250,13 +250,6 @@ define Device/dlink_dir-1960-a1
 endef
 TARGET_DEVICES += dlink_dir-1960-a1
 
-define Device/dlink_dir-2640-a1
-  $(Device/dlink_dir-xx60-a1)
-  DEVICE_MODEL := DIR-2640
-  DEVICE_VARIANT := A1
-endef
-TARGET_DEVICES += dlink_dir-2640-a1
-
 define Device/dlink_dir-2660-a1
   $(Device/dlink_dir-xx60-a1)
   DEVICE_MODEL := DIR-2660
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 115c91d461..f052c9646c 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
@@ -26,7 +26,6 @@ d-team,pbr-m1)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "wan"
 	;;
 dlink,dir-1960-a1|\
-dlink,dir-2640-a1|\
 dlink,dir-2660-a1)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:white:net" "wan"
 	;;
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index 560671008b..81ebcdb7ae 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -46,7 +46,6 @@ platform_do_upgrade() {
 	asus,rt-ac65p|\
 	asus,rt-ac85p|\
 	dlink,dir-1960-a1|\
-	dlink,dir-2640-a1|\
 	dlink,dir-2660-a1|\
 	hiwifi,hc5962|\
 	linksys,ea7300-v1|\