mediatek: add support for Ruijie RG-X60 Pro (#230)

Signed-off-by: Ashley Lee <code@emtips.net>

package/boot/uboot-envtools/files/mediatek

@@ -25,6 +25,7 @@ livinet,zr-3020*)
 	;;
 h3c,nx30pro |\
 *clt,r30b1* |\
+ruijie,rg-x60-pro* |\
 cmcc,rax3000m)
 	ubootenv_add_uci_config "/dev/mtd2" "0x0" "0x80000" "0x20000" "4"
 	;;

package/mtk/applications/mtk-smp/files/smp.sh

@@ -737,6 +737,7 @@ setup_model()
 	bananapi,bpi-r3mini* |\
 	netcore,n60 |\
 	glinet,gl-mt6000|\
+	ruijie,rg-x60-pro |\
 	jdcloud,re-cp-03 |\
 	tplink,tl-xdr608* |\
 	*7986*)

target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro-stock.dts

@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+
+/dts-v1/;
+#include "mt7986a-ruijie-rg-x60-pro.dtsi"
+
+/ {
+	compatible = "ruijie,rg-x60-pro-uboot", "mediatek,mt7986a";
+ 	model = "Ruijie RG-X60 Pro (Stock)";
+
+	nmbm_spim_nand {
+		compatible = "generic,nmbm";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		lower-mtd-device = <&spi_nand>;
+		forced-create;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <0x01>;
+			#size-cells = <0x01>;
+
+ 			partition@0 {
+ 				label = "BL2";
+ 				reg = <0x000000 0x100000>;
+ 				read-only;
+ 			};
+
+ 			partition@100000 {
+ 				label = "u-boot-env";
+ 				reg = <0x100000 0x80000>;
+ 				read-only;
+ 			};
+
+ 			partition@180000 {
+ 				label = "Factory";
+ 				reg = <0x180000 0x200000>;
+ 				read-only;
+ 			};
+
+ 			partition@380000 {
+ 				label = "FIP";
+ 				reg = <0x380000 0x200000>;
+ 			};
+
+ 			partition@580000 {
+ 				label = "product_info";
+ 				reg = <0x580000 0x80000>;
+ 				read-only;
+ 			};
+
+ 			partition@600000 {
+ 				label = "kdump";
+ 				reg = <0x600000 0x80000>;
+ 				read-only;
+ 			};
+
+ 			partition@680000 {
+ 				label = "ubi";
+ 				reg = <0x680000 0x3f00000>;
+ 			};
+		};
+	};
+};

target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dts

@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+
+/dts-v1/;
+#include "mt7986a-ruijie-rg-x60-pro.dtsi"
+
+/ {
+	compatible = "ruijie,rg-x60-pro", "mediatek,mt7986a";
+ 	model = "Ruijie RG-X60 Pro";
+
+	nmbm_spim_nand {
+		compatible = "generic,nmbm";
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		lower-mtd-device = <&spi_nand>;
+		forced-create;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <0x01>;
+			#size-cells = <0x01>;
+
+ 			partition@0 {
+ 				label = "BL2";
+ 				reg = <0x000000 0x100000>;
+ 				read-only;
+ 			};
+
+ 			partition@100000 {
+ 				label = "u-boot-env";
+ 				reg = <0x100000 0x80000>;
+ 				read-only;
+ 			};
+
+ 			partition@180000 {
+ 				label = "Factory";
+ 				reg = <0x180000 0x200000>;
+ 				read-only;
+ 			};
+
+ 			partition@380000 {
+ 				label = "FIP";
+ 				reg = <0x380000 0x200000>;
+ 			};
+
+ 			partition@580000 {
+ 				label = "product_info";
+ 				reg = <0x580000 0x80000>;
+ 				read-only;
+ 			};
+
+ 			partition@600000 {
+ 				label = "kdump";
+ 				reg = <0x600000 0x80000>;
+ 				read-only;
+ 			};
+
+ 			partition@680000 {
+ 				label = "ubi";
+ 				reg = <0x680000 0x6b00000>;
+ 			};
+		};
+	};
+};

target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-pro.dtsi

@@ -0,0 +1,246 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+
+/dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/leds/common.h>
+
+#include "mt7986a.dtsi"
+#include "mt7986a-pinctrl.dtsi"
+
+/ {
+	compatible = "ruijie,rg-x60-pro", "mediatek,mt7986a";
+	model = "Ruijie RG-X60 Pro";
+
+	aliases {
+		serial0 = &uart0;
+		led-boot = &led_system;
+		led-failsafe = &led_alarm;
+		led-running = &led_system;
+		led-upgrade = &led_alarm;
+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n1 loglevel=8 earlycon=uart8250,mmio32,0x11002000";
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x20000000>;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		button-0 {
+			label = "reset";
+			gpios = <&pio 9 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+
+		button-1 {
+			label = "mesh";
+			gpios = <&pio 10 GPIO_ACTIVE_LOW>;
+			linux,code = <BTN_MISC>;
+		};
+	};
+
+	leds-gpio {
+		compatible = "gpio-leds";
+
+		led_system: led-0 {
+			label = "white:status";
+			gpios = <&pio 22 GPIO_ACTIVE_LOW>;
+		};
+
+		led_alarm: led-1 {
+			label = "purple:status";
+			gpios = <&pio 11 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&eth {
+	status = "okay";
+
+	gmac0: mac@0 {
+		compatible = "mediatek,eth-mac";
+		reg = <0>;
+		phy-mode = "2500base-x";
+
+		fixed-link {
+			speed = <2500>;
+			full-duplex;
+			pause;
+		};
+	};
+
+	gmac1: mac@1 {
+		compatible = "mediatek,eth-mac";
+		reg = <1>;
+		phy-mode = "2500base-x";
+
+		ext-phy-reg = <7>;
+		ext-phy-reset-gpios = <&pio 6 0>;
+
+		fixed-link {
+			speed = <2500>;
+			full-duplex;
+			pause;
+		};
+	};
+
+	mdio: mdio-bus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+	};
+};
+
+&mdio {
+	switch: switch@1f {
+		compatible = "mediatek,mt7531";
+		reg = <31>;
+		reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+		interrupt-parent = <&pio>;
+		interrupts = <66 IRQ_TYPE_LEVEL_HIGH>;
+	};
+};
+
+&pio {
+	spi_flash_pins: spi-flash-pins-33-to-38 {
+		mux {
+			function = "spi";
+			groups = "spi0", "spi0_wp_hold";
+		};
+		conf-pu {
+			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
+			drive-strength = <8>;
+			mediatek,pull-up-adv = <0>; /* bias-disable */
+		};
+		conf-pd {
+			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
+			drive-strength = <8>;
+			mediatek,pull-down-adv = <0>; /* bias-disable */
+		};
+	};
+
+	wf_2g_5g_pins: wf_2g_5g-pins {
+		mux {
+			function = "wifi";
+			groups = "wf_2g", "wf_5g";
+		};
+		conf {
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
+			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
+			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
+			       "WF1_TOP_CLK", "WF1_TOP_DATA";
+			drive-strength = <4>;
+		};
+	};
+
+	wf_dbdc_pins: wf_dbdc-pins {
+		mux {
+			function = "wifi";
+			groups = "wf_dbdc";
+		};
+		conf {
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
+			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
+			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
+			       "WF1_TOP_CLK", "WF1_TOP_DATA";
+			drive-strength = <MTK_DRIVE_4mA>;
+		};
+	};
+};
+
+&hnat {
+	mtketh-wan = "eth1";
+	mtketh-lan = "lan";
+	mtketh-max-gmac = <2>;
+	status = "okay";
+};
+
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_flash_pins>;
+    cs-gpios = <0>, <0>;
+	status = "okay";
+
+	spi_nand: spi_nand@1 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "spi-nand";
+		reg = <1>;
+		spi-max-frequency = <52000000>;
+		spi-tx-bus-width = <4>;
+		spi-rx-bus-width = <4>;
+		spi-cal-enable;
+		spi-cal-mode = "read-data";
+		spi-cal-datalen = <7>;
+		spi-cal-data = /bits/ 8 <0x53 0x50 0x49 0x4E 0x41 0x4E 0x44>; /* 'SPINAND' */
+		spi-cal-addrlen = <5>;
+		spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
+	};
+};
+
+&switch {
+	ports {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		port@0 {
+			reg = <0>;
+			label = "lan0";
+		};
+
+		port@1 {
+			reg = <1>;
+			label = "lan1";
+		};
+
+		port@2 {
+			reg = <2>;
+			label = "lan2";
+		};
+
+		port@3 {
+			reg = <3>;
+			label = "lan3";
+		};
+
+		port@6 {
+			reg = <6>;
+			label = "cpu";
+			ethernet = <&gmac0>;
+			phy-mode = "2500base-x";
+
+			fixed-link {
+				speed = <2500>;
+				full-duplex;
+				pause;
+			};
+		};
+	};
+};
+
+&wbsys {
+	status = "okay";
+	pinctrl-names = "default", "dbdc";
+	pinctrl-0 = <&wf_2g_5g_pins>;
+	pinctrl-1 = <&wf_dbdc_pins>;
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&watchdog {
+	status = "okay";
+};

target/linux/mediatek/image/mt7986.mk

@@ -490,6 +490,26 @@ define Device/glinet_gl-mt6000
 endef
 TARGET_DEVICES += glinet_gl-mt6000
 
+define Device/ruijie-rg-x60-pro-stock
+  DEVICE_VENDOR := Ruijie
+  DEVICE_MODEL := Ruijie RG-X60 Pro (Stock)
+  DEVICE_DTS := mt7986a-ruijie-rg-x60-pro-stock
+  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+  SUPPORTED_DEVICES := ruijie,rg-x60-pro-stock
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+TARGET_DEVICES += ruijie-rg-x60-pro-stock
+
+define Device/ruijie-rg-x60-pro
+  DEVICE_VENDOR := Ruijie
+  DEVICE_MODEL := Ruijie RG-X60 Pro
+  DEVICE_DTS := mt7986a-ruijie-rg-x60-pro
+  DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
+  SUPPORTED_DEVICES := ruijie,rg-x60-pro
+  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
+endef
+TARGET_DEVICES += ruijie-rg-x60-pro
+
 define Device/tplink_tl-common
     DEVICE_VENDOR := TP-Link
     DEVICE_DTS_DIR := $(DTS_DIR)/mediatek

target/linux/mediatek/mt7986/base-files/etc/board.d/02_network

@@ -27,7 +27,8 @@ mediatek_setup_interfaces()
 	bananapi,bpi-r3mini*)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		;;
-	netcore,n60)
+	netcore,n60 |\
+	ruijie,rg-x60-pro*)
 		ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1
 		;;
  	glinet,gl-mt6000)
@@ -57,15 +58,24 @@ mediatek_setup_macs()
 	
 	case $board in
 	*netcore,n60*)
-	wifi_mac=$(mtd_get_mac_binary $part_name 4)
+		wifi_mac=$(mtd_get_mac_binary $part_name 4)
-	lan_mac="$(macaddr_add $wifi_mac -1)"
+		lan_mac="$(macaddr_add $wifi_mac -1)"
-	wan_mac="$(macaddr_add $wifi_mac -2)"
+		wan_mac="$(macaddr_add $wifi_mac -2)"
 		;;
 	glinet,gl-mt6000)
  		label_mac=$(mmc_get_mac_binary factory 0x0a)
  		wan_mac=$label_mac
  		lan_mac=$(macaddr_add "$label_mac" 2)
  		;;
+	ruijie,rg-x60-pro*)
+ 		label_mac=$(mtd_get_mac_ascii product_info ethaddr)
+ 		wan_mac=$label_mac
+ 		lan_mac=$(macaddr_add "$label_mac" 1)
+		local wifi_n_ax_mac="$(macaddr_add $label_mac 2)"
+		echo "MacAddress=$wifi_n_ax_mac" >> /etc/wireless/mediatek/mt7986-ax6000.dbdc.b0.dat
+		local wifi_ac_ax_mac="$(macaddr_add $label_mac 3)"
+		echo "MacAddress=$wifi_ac_ax_mac" >> /etc/wireless/mediatek/mt7986-ax6000.dbdc.b1.dat
+ 		;;
 	jdcloud,re-cp-03)
 		wan_mac=$(mmc_get_mac_binary factory 0x2a)
 		lan_mac=$(mmc_get_mac_binary factory 0x24)

target/linux/mediatek/mt7986/base-files/lib/preinit/90_extract_caldata

@@ -16,7 +16,8 @@ caldata_validate() {
 
 do_extract_caldata() {
 	case $(board_name) in
-	glinet,gl-mt6000|\
+	glinet,gl-mt6000 |\
+	ruijie,rg-x60-pro* |\
 	jdcloud,re-cp-03)
 		FIRMWARE=MT7986_ePAeLNA_EEPROM_AX6000.bin
 		caldata_validate && exit 0

target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh

@@ -147,8 +147,9 @@ platform_do_upgrade() {
 		;;
 	xiaomi,redmi-router-ax6000 |\
 	bananapi,bpi-r3mini |\
-	netcore,n60|\
+	netcore,n60 |\
-	tplink,tl-xdr608*|\
+	ruijie,rg-x60-pro* |\
+	tplink,tl-xdr608* |\
 	*snand*)
 		nand_do_upgrade "$1"
 		;;
@@ -177,11 +178,12 @@ platform_check_image() {
 	case "$board" in
 	xiaomi,redmi-router-ax6000* |\
 	bananapi,bpi-r3mini* |\
-	netcore,n60|\
+	netcore,n60 |\
+	ruijie,rg-x60-pro* |\
 	*snand* |\
-	glinet,gl-mt6000|\
+	glinet,gl-mt6000 |\
-	jdcloud,re-cp-03|\
+	jdcloud,re-cp-03 |\
-	tplink,tl-xdr608*|\
+	tplink,tl-xdr608* |\
 	*emmc*)
 		# tar magic `ustar`
 		magic="$(dd if="$1" bs=1 skip=257 count=5 2>/dev/null)"