[openwrt/openwrt] ramips: add support for D-Link DIR-867/DIR-882 A1

LEDE Commits lede-commits at lists.infradead.org
Thu Jul 16 12:49:30 EDT 2020


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

commit 73e8f23579bcb87764dae9ed0aefe28be3183d3e
Author: Mateus B. Cassiano <mbc07 at live.com>
AuthorDate: Wed Jul 15 17:45:39 2020 -0400

    ramips: add support for D-Link DIR-867/DIR-882 A1
    
    This patch adds support for D-Link DIR-867 A1 and D-Link DIR-882 A1. Given
    the similarity of these devices, this patch also introduces a common DTS
    shared between DIR-867 A1, DIR-878 A1 and DIR-882 A1.
    
    Specifications:
    * Board: AP-MTKH7-0002
    * SoC: MediaTek MT7621AT
    * RAM: 128 MB (DDR3)
    * Flash: 16 MB (SPI NOR)
    * WiFi: MediaTek MT7615N (x2)
    * Switch: 1 WAN, 4 LAN (Gigabit)
    * Ports: 1 USB 2.0, 1 USB 3.0
    * Buttons: Reset, WiFi Toggle, WPS
    * LEDs: Power (green/orange), Internet (green/orange), WiFi 2.4G (green),
            WiFi 5G (green), USB 2.0 (green), USB 3.0 (green)
    
    Notes:
    * WiFi 2.4G and WiFi 5G LEDs are wired directly to the wireless chips
    * DIR-867 wireless chips are limited to 3x3 streams at hardware level
    * USB ports and related LEDs available only on DIR-882
    
    Serial port:
    * Parameters: 57600, 8N1
    * Location: J1 header (close to the Reset, WiFi and WPS buttons)
    * Pinout: 1 - VCC
              2 - RXD
              3 - TXD
              4 - GND
    
    Installation:
    * D-Link Recovery GUI: power down the router, press and hold the reset
      button, then re-plug it. Keep the reset button pressed until the power
      LED starts flashing orange, manually assign a static IP address under
      the 192.168.0.xxx subnet (e.g. 192.168.0.2) and go to http://192.168.0.1
    
    * Some modern browsers may have problems flashing via the Recovery GUI,
      if that occurs consider uploading the firmware through cURL:
    
        curl -v -i -F "firmware=@file.bin" 192.168.0.1
    
    Signed-off-by: Mateus B. Cassiano <mbc07 at live.com>
    [move DEVICE_VARIANT to individual definitions]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../linux/ramips/dts/mt7621_dlink_dir-867-a1.dts   |  40 ++++++
 .../linux/ramips/dts/mt7621_dlink_dir-878-a1.dts   | 143 +--------------------
 .../linux/ramips/dts/mt7621_dlink_dir-882-a1.dts   |  54 ++++++++
 ...dir-878-a1.dts => mt7621_dlink_dir-8xx-a1.dtsi} |  32 -----
 target/linux/ramips/image/mt7621.mk                |  37 ++++--
 .../ramips/mt7621/base-files/etc/board.d/01_leds   |   4 +-
 6 files changed, 126 insertions(+), 184 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts
new file mode 100644
index 0000000000..34ddbeaec3
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-867-a1.dts
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
+
+/ {
+	compatible = "dlink,dir-867-a1", "mediatek,mt7621-soc";
+	model = "D-Link DIR-867 A1";
+
+	aliases {
+		led-boot = &led_power_orange;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_net_orange;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_orange: power_orange {
+			label = "dir-867-a1:orange:power";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		led_power_green: power_green {
+			label = "dir-867-a1:green:power";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+		};
+
+		led_net_orange: net_orange {
+			label = "dir-867-a1:orange:net";
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+		};
+
+		net_green {
+			label = "dir-867-a1:green:net";
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
index 15c46cb5f7..e2f569f40f 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /dts-v1/;
 
-#include "mt7621.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
 
 / {
 	compatible = "dlink,dir-878-a1", "mediatek,mt7621-soc";
@@ -15,11 +12,6 @@
 		led-failsafe = &led_power_green;
 		led-running = &led_power_green;
 		led-upgrade = &led_net_orange;
-		label-mac-device = &gmac0;
-	};
-
-	chosen {
-		bootargs = "console=ttyS0,57600";
 	};
 
 	leds {
@@ -45,137 +37,4 @@
 			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
 		};
 	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			label = "reset";
-			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RESTART>;
-		};
-
-		wps {
-			label = "wps";
-			gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WPS_BUTTON>;
-		};
-
-		wifi {
-			label = "wifi";
-			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_RFKILL>;
-		};
-	};
-};
-
-&spi0 {
-	status = "okay";
-
-	flash at 0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <50000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition at 0 {
-				label = "u-boot";
-				reg = <0x0 0x30000>;
-				read-only;
-			};
-
-			partition at 30000 {
-				label = "u-boot-env";
-				reg = <0x30000 0x10000>;
-				read-only;
-			};
-
-			factory: partition at 40000 {
-				label = "factory";
-				reg = <0x40000 0x20000>;
-				read-only;
-			};
-
-			partition at 60000 {
-				compatible = "sge,uimage";
-				label = "firmware";
-				reg = <0x60000 0xfa0000>;
-			};
-		};
-	};
-};
-
-&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-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-active-low;
-		};
-	};
-};
-
-&gmac0 {
-	mtd-mac-address = <&factory 0xe000>;
-};
-
-&switch0 {
-	ports {
-		port at 0 {
-			status = "okay";
-			label = "lan4";
-		};
-
-		port at 1 {
-			status = "okay";
-			label = "lan3";
-		};
-
-		port at 2 {
-			status = "okay";
-			label = "lan2";
-		};
-
-		port at 3 {
-			status = "okay";
-			label = "lan1";
-		};
-
-		port at 4 {
-			status = "okay";
-			label = "wan";
-			mtd-mac-address = <&factory 0xe006>;
-		};
-	};
-};
-
-&state_default {
-	gpio {
-		groups = "i2c", "uart3", "jtag", "wdt";
-		function = "gpio";
-	};
 };
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts
new file mode 100644
index 0000000000..11f70ecf3f
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-882-a1.dts
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7621_dlink_dir-8xx-a1.dtsi"
+
+/ {
+	compatible = "dlink,dir-882-a1", "mediatek,mt7621-soc";
+	model = "D-Link DIR-882 A1";
+
+	aliases {
+		led-boot = &led_power_orange;
+		led-failsafe = &led_power_green;
+		led-running = &led_power_green;
+		led-upgrade = &led_net_orange;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_orange: power_orange {
+			label = "dir-882-a1:orange:power";
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+
+		led_power_green: power_green {
+			label = "dir-882-a1:green:power";
+			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
+		};
+
+		led_net_orange: net_orange {
+			label = "dir-882-a1:orange:net";
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+		};
+
+		net_green {
+			label = "dir-882-a1:green:net";
+			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+		};
+
+		usb2 {
+			label = "dir-882-a1:green:usb2";
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&ehci_port2>;
+			linux,default-trigger = "usbport";
+		};
+
+		usb3 {
+			label = "dir-882-a1:green:usb3";
+			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+			trigger-sources = <&xhci_ehci_port1>;
+			linux,default-trigger = "usbport";
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts b/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi
similarity index 75%
copy from target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
copy to target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi
index 15c46cb5f7..f2f0a4c56f 100644
--- a/target/linux/ramips/dts/mt7621_dlink_dir-878-a1.dts
+++ b/target/linux/ramips/dts/mt7621_dlink_dir-8xx-a1.dtsi
@@ -1,5 +1,4 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
 
 #include "mt7621.dtsi"
 
@@ -7,14 +6,7 @@
 #include <dt-bindings/input/input.h>
 
 / {
-	compatible = "dlink,dir-878-a1", "mediatek,mt7621-soc";
-	model = "D-Link DIR-878 A1";
-
 	aliases {
-		led-boot = &led_power_orange;
-		led-failsafe = &led_power_green;
-		led-running = &led_power_green;
-		led-upgrade = &led_net_orange;
 		label-mac-device = &gmac0;
 	};
 
@@ -22,30 +14,6 @@
 		bootargs = "console=ttyS0,57600";
 	};
 
-	leds {
-		compatible = "gpio-leds";
-
-		led_power_orange: power_orange {
-			label = "dir-878-a1:orange:power";
-			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		};
-
-		led_power_green: power_green {
-			label = "dir-878-a1:green:power";
-			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
-		};
-
-		led_net_orange: net_orange {
-			label = "dir-878-a1:orange:net";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
-		};
-
-		net_green {
-			label = "dir-878-a1:green:net";
-			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-		};
-	};
-
 	keys {
 		compatible = "gpio-keys";
 
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index e97d2315f1..0315822c0b 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -220,6 +220,18 @@ define Device/buffalo_wsr-600dhp
 endef
 TARGET_DEVICES += buffalo_wsr-600dhp
 
+define Device/dlink_dir-8xx-a1
+  IMAGE_SIZE := 16000k
+  DEVICE_VENDOR := D-Link
+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
+  KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96
+  IMAGES += factory.bin
+  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
+	pad-rootfs | append-metadata | check-size
+  IMAGE/factory.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
+	check-size
+endef
+
 define Device/dlink_dir-860l-b1
   $(Device/seama)
   BLOCKSIZE := 64k
@@ -236,21 +248,28 @@ define Device/dlink_dir-860l-b1
 endef
 TARGET_DEVICES += dlink_dir-860l-b1
 
+define Device/dlink_dir-867-a1
+  $(Device/dlink_dir-8xx-a1)
+  DEVICE_MODEL := DIR-867
+  DEVICE_VARIANT := A1
+endef
+TARGET_DEVICES += dlink_dir-867-a1
+
 define Device/dlink_dir-878-a1
-  IMAGE_SIZE := 16000k
-  DEVICE_VENDOR := D-Link
+  $(Device/dlink_dir-8xx-a1)
   DEVICE_MODEL := DIR-878
   DEVICE_VARIANT := A1
-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-basic
-  KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr 96
-  IMAGES += factory.bin
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
-	pad-rootfs | append-metadata | check-size
-  IMAGE/factory.bin := append-kernel | append-rootfs | uimage-padhdr 96 |\
-	check-size
 endef
 TARGET_DEVICES += dlink_dir-878-a1
 
+define Device/dlink_dir-882-a1
+  $(Device/dlink_dir-8xx-a1)
+  DEVICE_MODEL := DIR-882
+  DEVICE_VARIANT := A1
+  DEVICE_PACKAGES += kmod-usb3 kmod-usb-ledtrig-usbport
+endef
+TARGET_DEVICES += dlink_dir-882-a1
+
 define Device/d-team_newifi-d2
   $(Device/uimage-lzma-loader)
   IMAGE_SIZE := 32448k
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 a44b1a09d0..43cd77ccd1 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
@@ -27,7 +27,9 @@ gehua,ghl-r-001)
 	ucidef_set_led_netdev "internet" "internet" "$boardname:blue:internet" "wan"
 	;;
 dlink,dir-860l-b1|\
-dlink,dir-878-a1)
+dlink,dir-867-a1|\
+dlink,dir-878-a1|\
+dlink,dir-882-a1)
 	ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "wan"
 	;;
 gnubee,gb-pc1|\



More information about the lede-commits mailing list