Merge Mainline

2020-11-08 02:01:12 +08:00 · 2020-11-08 02:01:12 +08:00 · bd925ef220
commit bd925ef220
parent e23e7c493e 9867d08e07
13 changed files with 772 additions and 9 deletions
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@ -12,9 +12,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2020-10-27
-PKG_SOURCE_VERSION:=75f2374f1656b6f2eee3fa0e3b871f5ddcbee1c4
-PKG_MIRROR_HASH:=6bae7e57c6b349bdf6fbd62d4056127d186cbb80cd73959d6695007088ecf16c
+PKG_SOURCE_DATE:=2020-11-06
+PKG_SOURCE_VERSION:=b0de894830a93da5b303a3d89a42baf163d0a58c
+PKG_MIRROR_HASH:=ba7f7631fa74d3bede0241f5d96ee4939f15164e79290d1ac7fd15fc8ed628d9
 CMAKE_INSTALL:=1

 PKG_LICENSE:=GPL-2.0
--- a/target/linux/generic/hack-5.4/703-add_vsc8504_support.patch
+++ b/target/linux/generic/hack-5.4/703-add_vsc8504_support.patch
@ -0,0 +1,57 @@
+From: Roman Kuzmitskii <damex.pp@icloud.com>
+Date: Thu, 05 Nov 2020 02:00:00 +0000
+Subject: [PATCH] net: phy: vitesse: add vsc8504 support
+
+This patch adds support for vsc8504 phy.
+That phy is changed owner:
+ vitesse -> microsemi -> microchip
+So is its driver in kernel was changed and rewritten.
+
+there is no need to upstream this patch.
+this vsc8504 is supported by newer kernels out of box.
+support could be enabled by CONFIG_MICROSEMI_PHY.
+
+Tested-by: Johannes Kimmel <fff@bareminimum.eu>
+Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
+--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
+@@ -61,6 +61,7 @@
+ 
+ #define PHY_ID_VSC8234			0x000fc620
+ #define PHY_ID_VSC8244			0x000fc6c0
+#define PHY_ID_VSC8504			0x000704c2
+ #define PHY_ID_VSC8572			0x000704d0
+ #define PHY_ID_VSC8601			0x00070420
+ #define PHY_ID_VSC7385			0x00070450
+@@ -292,6 +293,7 @@
+ 		err = phy_write(phydev, MII_VSC8244_IMASK,
+ 			(phydev->drv->phy_id == PHY_ID_VSC8234 ||
+ 			 phydev->drv->phy_id == PHY_ID_VSC8244 ||
+			 phydev->drv->phy_id == PHY_ID_VSC8504 ||
+ 			 phydev->drv->phy_id == PHY_ID_VSC8572 ||
+ 			 phydev->drv->phy_id == PHY_ID_VSC8601) ?
+ 				MII_VSC8244_IMASK_MASK :
+@@ -402,6 +404,15 @@
+ 	.ack_interrupt	= &vsc824x_ack_interrupt,
+ 	.config_intr	= &vsc82xx_config_intr,
+ }, {
+	.phy_id         = PHY_ID_VSC8504,
+	.name           = "Vitesse VSC8504",
+	.phy_id_mask    = 0x000ffff0,
+	/* PHY_GBIT_FEATURES */
+	.config_init    = &vsc824x_config_init,
+	.config_aneg    = &vsc82x4_config_aneg,
+	.ack_interrupt  = &vsc824x_ack_interrupt,
+	.config_intr    = &vsc82xx_config_intr,
+}, {
+ 	.phy_id         = PHY_ID_VSC8572,
+ 	.name           = "Vitesse VSC8572",
+ 	.phy_id_mask    = 0x000ffff0,
+@@ -488,6 +499,7 @@
+ static struct mdio_device_id __maybe_unused vitesse_tbl[] = {
+ 	{ PHY_ID_VSC8234, 0x000ffff0 },
+ 	{ PHY_ID_VSC8244, 0x000fffc0 },
+	{ PHY_ID_VSC8504, 0x000ffff0 },
+ 	{ PHY_ID_VSC8572, 0x000ffff0 },
+ 	{ PHY_ID_VSC7385, 0x000ffff0 },
+ 	{ PHY_ID_VSC7388, 0x000ffff0 },
--- a/target/linux/octeon/base-files/etc/board.d/01_network
+++ b/target/linux/octeon/base-files/etc/board.d/01_network
@ -11,6 +11,9 @@ case "$(board_name)" in
 itus,shield-router)
 	ucidef_set_interfaces_lan_wan "eth1 eth2" "eth0"
 	;;
+ubnt,edgerouter-4)
+	ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "lan0"
+	;;
 *)
 	ucidef_set_interfaces_lan_wan "eth0" "eth1"
 	;;
--- a/target/linux/octeon/base-files/lib/preinit/01_sysinfo
+++ b/target/linux/octeon/base-files/lib/preinit/01_sysinfo
@ -17,6 +17,11 @@ do_sysinfo_octeon() {
 		name="erpro"
 		;;

+	"UBNT_E300"*)
+		# let generic 02_sysinfo handle it since device has its own device tree
+		return 0
+		;;
+
 	"ITUS_SHIELD"*)
 		name="itus,shield-router"
 		;;
--- a/target/linux/octeon/base-files/lib/preinit/79_move_config
+++ b/target/linux/octeon/base-files/lib/preinit/79_move_config
@ -21,6 +21,9 @@ octeon_move_config() {
 		itus,shield-router)
 			move_config "/dev/mmcblk1p1"
 			;;
+		ubnt,edgerouter-4)
+			move_config "/dev/mmcblk0p1"
+			;;
 	esac
 }

--- a/target/linux/octeon/base-files/lib/upgrade/platform.sh
+++ b/target/linux/octeon/base-files/lib/upgrade/platform.sh
@ -29,6 +29,11 @@ platform_copy_config() {
 		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
 		umount /mnt
 		;;
+	ubnt,edgerouter-4)
+		mount -t vfat /dev/mmcblk0p1 /mnt
+		cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
+		umount /mnt
+		;;
 	esac
 }

@ -78,7 +83,8 @@ platform_do_upgrade() {

 	[ -b "${rootfs}" ] || return 1
 	case "$board" in
-	er)
+	er | \
+	ubnt,edgerouter-4)
 		kernel=mmcblk0p1
 		;;
 	erlite)
@ -107,7 +113,8 @@ platform_check_image() {
 	case "$board" in
 	er | \
 	erlite | \
-	itus,shield-router)
+	itus,shield-router | \
+	ubnt,edgerouter-4)
 		local kernel_length=$(tar xf $tar_file $board_dir/kernel -O | wc -c 2> /dev/null)
 		local rootfs_length=$(tar xf $tar_file $board_dir/root -O | wc -c 2> /dev/null)
 		[ "$kernel_length" = 0 -o "$rootfs_length" = 0 ] && {
--- a/target/linux/octeon/config-5.4
+++ b/target/linux/octeon/config-5.4
@ -25,7 +25,7 @@ CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BUILTIN_DTB=y
 # CONFIG_CAVIUM_CN63XXP1 is not set
-CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=2
+CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=0
 CONFIG_CAVIUM_OCTEON_LOCK_L2=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT=y
@ -68,7 +68,14 @@ CONFIG_CRYPTO_RNG2=y
 CONFIG_DNOTIFY=y
 CONFIG_DTC=y
 CONFIG_EARLY_PRINTK=y
+CONFIG_EDAC=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_LEGACY_SYSFS=y
+CONFIG_EDAC_OCTEON_PC=y
+CONFIG_EDAC_OCTEON_L2C=y
+CONFIG_EDAC_OCTEON_LMC=y
+CONFIG_EDAC_OCTEON_PCI=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EFI_EARLYCON=y
 CONFIG_ENABLE_MUST_CHECK=y
@ -150,6 +157,8 @@ CONFIG_HZ=250
 CONFIG_HZ_250=y
 CONFIG_HZ_PERIODIC=y
 CONFIG_IMAGE_CMDLINE_HACK=y
+CONFIG_I2C=y
+CONFIG_I2C_OCTEON=y
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_IRQCHIP=y
 CONFIG_IRQ_DOMAIN=y
@ -173,14 +182,14 @@ CONFIG_MIPS_ASID_SHIFT=0
 CONFIG_MIPS_CMDLINE_FROM_BOOTLOADER=y
 # CONFIG_MIPS_CMDLINE_FROM_DTB is not set
 CONFIG_MIPS_EBPF_JIT=y
-# CONFIG_MIPS_ELF_APPENDED_DTB is not set
+CONFIG_MIPS_ELF_APPENDED_DTB=y
 CONFIG_MIPS_L1_CACHE_SHIFT=7
 CONFIG_MIPS_L1_CACHE_SHIFT_7=y
 # CONFIG_MIPS_NO_APPENDED_DTB is not set
 CONFIG_MIPS_NR_CPU_NR_MAP=1024
 CONFIG_MIPS_NR_CPU_NR_MAP_1024=y
 CONFIG_MIPS_PGD_C0_CONTEXT=y
-CONFIG_MIPS_RAW_APPENDED_DTB=y
+# CONFIG_MIPS_RAW_APPENDED_DTB is not set
 CONFIG_MIPS_SPRAM=y
 # CONFIG_MIPS_VA_BITS_48 is not set
 CONFIG_MMC=y
@ -192,7 +201,10 @@ CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MTD_CFI_INTELEXT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
 CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NET_DSA=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NLS=y
 CONFIG_NLS_CODEPAGE_437=y
@ -202,7 +214,7 @@ CONFIG_NR_CPUS=16
 CONFIG_NR_CPUS_DEFAULT_64=y
 CONFIG_NVMEM=y
 CONFIG_OCTEON_ETHERNET=y
-# CONFIG_OCTEON_ILM is not set
+CONFIG_OCTEON_ILM=y
 CONFIG_OCTEON_MGMT_ETHERNET=y
 CONFIG_OCTEON_USB=y
 CONFIG_OCTEON_WDT=y
@ -220,6 +232,8 @@ CONFIG_PADATA=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DRIVERS_LEGACY=y
+CONFIG_PCIEAER=y
+CONFIG_PCIEPORTBUS=y
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=3
 CONFIG_PHYLIB=y
@ -243,6 +257,9 @@ CONFIG_SG_POOL=y
 CONFIG_SMP=y
 CONFIG_SPARSEMEM=y
 CONFIG_SPARSEMEM_STATIC=y
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_OCTEON=y
 CONFIG_SRCU=y
 CONFIG_SWIOTLB=y
 CONFIG_SWPHY=y
@ -275,6 +292,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USE_OF=y
 CONFIG_VFAT_FS=y
+CONFIG_VITESSE_PHY=y
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_WATCHDOG_CORE=y
 CONFIG_WEAK_ORDERING=y
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn7130_ubnt_edgerouter-4.dts
@ -0,0 +1,213 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "cn71xx.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	compatible = "ubnt,edgerouter-4", "cavium,cn7130";
+	model = "Ubiquiti EdgeRouter 4";
+
+	aliases {
+		/* White + Blinking Blue */
+		led-boot = &led_power_white;
+		/* Blue + Blinking White */
+		led-failsafe = &led_power_blue;
+		/* Constant Blue */
+		led-running = &led_power_blue;
+		/* Blue + Blinking White */
+		led-upgrade = &led_power_blue;
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x0 0x00000000>,
+		      <0x0 0x10000000>,
+		      <0x0 0x20000000>,
+		      <0x0 0x30000000>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power_blue: power_blue {
+			label = "blue:power";
+			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+		};
+
+		led_power_white: power_white {
+			label = "white:power";
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys-polled";
+		poll-interval = <20>;
+
+		reset {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
+		};
+	};
+
+	sfp: sfp {
+		compatible = "sff,sfp";
+		i2c-bus = <&twsi0>;
+		/* Pins 12, 13 and 14 gets pulled low when SFP is plugged in */
+		mod-def0-gpio = <&gpio 12 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&usb0 {
+	status = "okay";
+};
+
+&xhci0 {
+	status = "okay";
+	dr_mode = "host";
+};
+
+&twsi0 {
+	status = "okay";
+
+	sfp_eeprom@50 {
+		compatible = "at,24c04";
+		reg = <0x50>;
+	};
+
+	sfp_eeprom@51 {
+		compatible = "at,24c04";
+		reg = <0x51>;
+	};
+};
+
+&spi {
+	status = "okay";
+
+	flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "Macronix,mx25l6405d", "spi-flash";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partition@0 {
+			label = "boot0";
+			read-only;
+			reg = <0x000000 0x300000>;
+		};
+
+		partition@300000 {
+			label = "dummy";
+			read-only;
+			reg = <0x300000 0x100000>;
+		};
+
+		eeprom: partition@400000 {
+			label = "eeprom";
+			read-only;
+			reg = <0x400000 0x10000>;
+		};
+	};
+};
+
+&mmc {
+	status = "okay";
+
+	mmc-slot@0 {
+		compatible = "mmc-slot";
+		reg = <0>;
+		non-removable;
+		max-frequency = <26000000>;
+		voltage-ranges = <3300 3300>;
+		bus-width = <8>;
+	};
+};
+
+&smi0 {
+	status = "okay";
+
+	phy4: ethernet-phy@4 {
+		device_type = "ethernet-phy";
+		interrupts = <17 8>;
+		interrupt-parent = <&gpio>;
+		compatible = "vitesse,vsc8504", "ethernet-phy-ieee802.3-c22";
+		reg = <4>;
+		sfp = <&sfp>;
+	};
+
+	phy5: ethernet-phy@5 {
+		device_type = "ethernet-phy";
+		interrupts = <17 8>;
+		interrupt-parent = <&gpio>;
+		compatible = "vitesse,vsc8504", "ethernet-phy-ieee802.3-c22";
+		reg = <5>;
+	};
+
+	phy6: ethernet-phy@6 {
+		device_type = "ethernet-phy";
+		interrupts = <17 8>;
+		interrupt-parent = <&gpio>;
+		compatible = "vitesse,vsc8504", "ethernet-phy-ieee802.3-c22";
+		reg = <6>;
+	};
+
+	phy7: ethernet-phy@7 {
+		device_type = "ethernet-phy";
+		interrupts = <17 8>;
+		interrupt-parent = <&gpio>;
+		compatible = "vitesse,vsc8504", "ethernet-phy-ieee802.3-c22";
+		reg = <7>;
+	};
+};
+
+&pip {
+	status = "okay";
+
+	interface@0 {
+		status = "okay";
+
+		ethernet@0 {
+			label = "lan3";
+			status = "okay";
+			phy-mode = "sgmii";
+			phy-handle = <&phy4>;
+			mtd-mac-address = <&eeprom 0>;
+		};
+
+		ethernet@1 {
+			label = "lan0";
+			status = "okay";
+			phy-mode = "sgmii";
+			phy-handle = <&phy5>;
+			mtd-mac-address = <&eeprom 0>;
+			mtd-mac-address-increment = <(1)>;
+		};
+
+		ethernet@2 {
+			label = "lan1";
+			status = "okay";
+			phy-mode = "sgmii";
+			phy-handle = <&phy6>;
+			mtd-mac-address = <&eeprom 0>;
+			mtd-mac-address-increment = <(2)>;
+		};
+
+		ethernet@3 {
+			label = "lan2";
+			status = "okay";
+			phy-mode = "sgmii";
+			phy-handle = <&phy7>;
+			mtd-mac-address = <&eeprom 0>;
+			mtd-mac-address-increment = <(3)>;
+		};
+	};
+};
--- a/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn71xx.dtsi
+++ b/target/linux/octeon/files/arch/mips/boot/dts/cavium-octeon/cn71xx.dtsi
@ -0,0 +1,357 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+/ {
+	compatible = "cavium,cn71xx";
+	#address-cells = <2>;
+	#size-cells = <2>;
+	interrupt-parent = <&ciu>;
+
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "simple-bus";
+		ranges;
+
+		bootbus@1180000000000 {
+			#address-cells = <2>;
+			#size-cells = <1>;
+			compatible = "cavium,octeon-3860-bootbus";
+			reg = <0x11800 0x00 0x00 0x200>;
+			ranges = <0x00 0x00 0x10000 0x10000000 0x00>,
+				 <0x01 0x00 0x10000 0x20000000 0x00>,
+				 <0x02 0x00 0x10000 0x30000000 0x00>,
+				 <0x03 0x00 0x10000 0x40000000 0x00>,
+				 <0x04 0x00 0x10000 0x50000000 0x00>,
+				 <0x05 0x00 0x10000 0x60000000 0x00>,
+				 <0x06 0x00 0x10000 0x70000000 0x00>,
+				 <0x07 0x00 0x10000 0x80000000 0x00>;
+		};
+
+		dma0: dma-engine@1180000000100 {
+			status = "disabled";
+			compatible = "cavium,octeon-5750-bootbus-dma";
+			reg = <0x11800 0x100 0x0 0x08>;
+			interrupts = <0 63>;
+		};
+
+		dma1: dma-engine@1180000000108 {
+			status = "disabled";
+			compatible = "cavium,octeon-5750-bootbus-dma";
+			reg = <0x11800 0x108 0x0 0x08>;
+			interrupts = <0 63>;
+		};
+
+		ciu: interrupt-controller@1070000000000 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-3860-ciu";
+			reg = <0x10700 0x00000000 0x0 0x7000>;
+			interrupt-controller;
+		};
+
+		cib0: interrupt-controller@107000000e000 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xe000 0x0 0x08>, /* RAW */
+			      <0x10700 0xe100 0x0 0x08>; /* EN */
+			cavium,max-bits = <23>;
+			interrupts = <1 24>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		cib1: interrupt-controller@107000000e200 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xe200 0x0 0x08>, /* RAW */
+			      <0x10700 0xe300 0x0 0x08>; /* EN */
+			cavium,max-bits = <12>;
+			interrupts = <1 52>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		cib2: interrupt-controller@107000000e400 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xe400 0x0 0x08>, /* RAW */
+			      <0x10700 0xe500 0x0 0x08>; /* EN */
+			cavium,max-bits = <6>;
+			interrupts = <1 63>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		cib3: interrupt-controller@107000000e600 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xe600 0x0 0x08>, /* RAW */
+			      <0x10700 0xe700 0x0 0x08>; /* EN */
+			cavium,max-bits = <4>;
+			interrupts = <2 16>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		cib4: interrupt-controller@107000000e800 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xe800 0x0 0x08>, /* RAW */
+			      <0x10700 0xea00 0x0 0x08>; /* EN */
+			cavium,max-bits = <11>;
+			interrupts = <1 33>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		cib5: interrupt-controller@107000000e900 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xe900 0x00 0x08>, /* RAW */
+			      <0x10700 0xeb00 0x00 0x08>; /* EN */
+			cavium,max-bits = <11>;
+			interrupts = <1 23>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		cib6: interrupt-controller@107000000ec00 {
+			#interrupt-cells = <2>;
+			compatible = "cavium,octeon-7130-cib";
+			reg = <0x10700 0xec00 0x0 0x08>, /* RAW */
+			      <0x10700 0xee00 0x0 0x08>; /* EN */
+			cavium,max-bits = <15>;
+			interrupts = <2 17>;
+			interrupt-parent = <&ciu>;
+			interrupt-controller;
+		};
+
+		gpio: gpio-controller@1070000000800 {
+			#interrupt-cells = <2>;
+			#gpio-cells = <2>;
+			compatible = "cavium,octeon-3860-gpio";
+			reg = <0x10700 0x800 0x0 0x100>;
+			interrupts = <0 16>, <0 17>, <0 18>, <0 19>,
+				     <0 20>, <0 21>, <0 22>, <0 23>,
+				     <0 24>, <0 25>, <0 26>, <0 27>,
+				     <0 28>, <0 29>, <0 30>, <0 31>;
+			interrupt-controller;
+			gpio-controller;
+		};
+
+		mmc: mmc@1180000002000 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-6130-mmc";
+			reg = <0x11800 0x2000 0x0 0x100>,
+			      <0x11800 0x168 0x0 0x20>;
+			interrupts = <1 19>, <0 63>;
+		};
+
+		smi0: mdio@1180000001800 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-3860-mdio";
+			reg = <0x11800 0x1800 0x0 0x40>;
+		};
+
+		smi1: mdio@1180000001900 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-3860-mdio";
+			reg = <0x11800 0x1900 0x0 0x40>;
+		};
+
+		pip: pip@11800a0000000 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-3860-pip";
+			reg = <0x11800 0xa0000000 0x0 0x2000>;
+
+			interface@0 {
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "cavium,octeon-3860-pip-interface";
+				reg = <0>; /* Interface */
+
+				ethernet@0 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <0>; /* Port */
+				};
+
+				ethernet@1 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <1>; /* Port */
+				};
+
+				ethernet@2 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <2>; /* Port */
+				};
+
+				ethernet@3 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <3>; /* Port */
+				};
+			};
+
+			interface@1 {
+				status = "disabled";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "cavium,octeon-3860-pip-interface";
+				reg = <1>; /* Interface */
+
+				ethernet@0 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <0>; /* Port */
+				};
+
+				ethernet@1 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <1>; /* Port */
+				};
+
+				ethernet@2 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <2>; /* Port */
+				};
+
+				ethernet@3 {
+					status = "disabled";
+					compatible = "cavium,octeon-3860-pip-port";
+					reg = <3>; /* Port */
+				};
+			};
+		};
+
+		twsi0: i2c@1180000001000 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-3860-twsi";
+			reg = <0x11800 0x1000 0x0 0x200>;
+			interrupts = <0 45>;
+			clock-frequency = <100000>;
+		};
+
+		twsi1: i2c@1180000001200 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-3860-twsi";
+			reg = <0x11800 0x1200 0x0 0x200>;
+			interrupts = <0 59>;
+			clock-frequency = <100000>;
+		};
+
+		uctl@118006c000000 {
+			status = "disabled";
+			#address-cells = <2>;
+			#size-cells = <2>;
+			compatible = "cavium,octeon-7130-sata-uctl";
+			reg = <0x11800 0x6c000000 0x00 0x100>;
+			ranges;
+
+			sata@16c0000000000 {
+				status = "disabled";
+				compatible = "cavium,octeon-7130-ahci";
+				reg = <0x16c00 0x00 0x00 0x200>;
+				interrupt-parent = <&cib3>;
+				interrupts = <2 4>;
+			};
+		};
+
+		usb0: uctl@1180068000000 {
+			status = "disabled";
+			#address-cells = <2>;
+			#size-cells = <2>;
+			compatible = "cavium,octeon-7130-usb-uctl";
+			reg = <0x11800 0x68000000 0x00 0x100>;
+			ranges;
+			power = <0x02 0x01 0x00>;
+			refclk-frequency = <100000000>;
+			refclk-type-hs = "pll_ref_clk";
+			refclk-type-ss = "dlmc_ref_clk1";
+
+			xhci0: xhci@1680000000000 {
+				status = "disabled";
+				compatible = "cavium,octeon-7130-xhci", "synopsys,dwc3";
+				reg = <0x16800 0x0 0x10 0x00>;
+				interrupts = <9 4>;
+				interrupt-parent = <&cib4>;
+			};
+		};
+
+		usb1: uctl@1180069000000 {
+			status = "disabled";
+			#address-cells = <2>;
+			#size-cells = <2>;
+			compatible = "cavium,octeon-7130-usb-uctl";
+			reg = <0x11800 0x69000000 0x00 0x100>;
+			ranges;
+			power = <0x02 0x02 0x01>;
+			refclk-frequency = <100000000>;
+			refclk-type-hs = "pll_ref_clk";
+			refclk-type-ss = "dlmc_ref_clk1";
+
+			xhci1: xhci@1690000000000 {
+				status = "disabled";
+				compatible = "cavium,octeon-7130-xhci", "synopsys,dwc3";
+				reg = <0x16900 0x0 0x10 0x00>;
+				interrupts = <9 4>;
+				interrupt-parent = <&cib5>;
+			};
+		};
+
+		uart0: serial@1180000000800 {
+			status = "disabled";
+			compatible = "cavium,octeon-3860-uart", "ns16550";
+			reg = <0x11800 0x800 0x0 0x400>;
+			reg-shift = <3>;
+			interrupts = <0 34>;
+			clock-frequency = <400000000>;
+			current-speed = <115200>;
+		};
+
+		uart1: serial@1180000000c00 {
+			status = "disabled";
+			compatible = "cavium,octeon-3860-uart", "ns16550";
+			reg = <0x11800 0xc00 0x0 0x400>;
+			reg-shift = <3>;
+			interrupts = <0 35>;
+			clock-frequency = <400000000>;
+			current-speed = <115200>;
+		};
+
+		ocla0@11800a8000000 {
+			status = "disabled";
+			compatible = "cavium,octeon-7130-ocla";
+			reg = <0x11800 0xa8000000 0x0 0x500000>;
+			interrupts = <0x08 0x01 0x09 0x01 0x0b 0x01>;
+			interrupt-parent = <&cib6>;
+		};
+
+		spi: spi@1070000001000 {
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-3010-spi";
+			reg = <0x10700 0x1000 0x00 0x100>;
+			interrupts = <0 58>;
+			spi-max-frequency = <100000000>;
+		};
+	};
+};
--- a/target/linux/octeon/image/Makefile
+++ b/target/linux/octeon/image/Makefile
@ -7,11 +7,17 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk

+define Build/append-dtb-to-elf
+	$(TARGET_CROSS)objcopy --update-section .appended_dtb=$(KDIR)/image-$(DEVICE_DTS).dtb $@
+endef
+
 define Build/strip-kernel
 	# Workaround pre-SDK-1.9.0 u-boot versions not handling the .notes section
 	$(TARGET_CROSS)strip -R .notes $@ -o $@.stripped && mv $@.stripped $@
 endef

+DTS_DIR := $(DTS_DIR)/cavium-octeon
+
 define Device/Default
  PROFILES = Default $$(DEVICE_NAME)
  KERNEL_NAME := vmlinux.elf
@ -48,6 +54,17 @@ define Device/ubnt_edgerouter
 endef
 TARGET_DEVICES += ubnt_edgerouter

+define Device/ubnt_edgerouter-4
+  DEVICE_VENDOR := Ubiquiti
+  DEVICE_MODEL := EdgeRouter 4
+  DEVICE_DTS := cn7130_ubnt_edgerouter-4
+  DEVICE_PACKAGES += kmod-gpio-button-hotplug kmod-leds-gpio kmod-of-mdio kmod-sfp kmod-usb3 kmod-usb-dwc3 kmod-usb-storage-uas
+  KERNEL := kernel-bin | patch-cmdline | append-dtb-to-elf
+  KERNEL_DEPENDS := $$(wildcard $(DTS_DIR)/$(DEVICE_DTS).dts)
+  CMDLINE := root=/dev/mmcblk0p2 rootfstype=squashfs,ext4 rootwait
+endef
+TARGET_DEVICES += ubnt_edgerouter-4
+
 ERLITE_CMDLINE:=-mtdparts=phys_mapped_flash:512k(boot0)ro,512k(boot1)ro,64k(eeprom)ro root=/dev/sda2 rootfstype=squashfs,ext4 rootwait
 define Device/ubnt_edgerouter-lite
  DEVICE_VENDOR := Ubiquiti
--- a/target/linux/octeon/patches-5.4/140-octeon_e300_support.patch
+++ b/target/linux/octeon/patches-5.4/140-octeon_e300_support.patch
@ -0,0 +1,18 @@
+--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+@@ -296,6 +296,7 @@
+ 	CVMX_BOARD_TYPE_CUST_PRIVATE_MIN = 20001,
+ 	CVMX_BOARD_TYPE_UBNT_E100 = 20002,
+ 	CVMX_BOARD_TYPE_ITUS_SHIELD = 20006,
+	CVMX_BOARD_TYPE_UBNT_E300 = 20300,
+ 	CVMX_BOARD_TYPE_KONTRON_S1901 = 21901,
+ 	CVMX_BOARD_TYPE_CUST_PRIVATE_MAX = 30000,
+ 
+@@ -397,6 +398,7 @@
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MIN)
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E100)
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_ITUS_SHIELD)
+		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_UBNT_E300)
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901)
+ 		ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX)
+ 	}
--- a/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
+++ b/target/linux/octeon/patches-5.4/700-allocate_interface_by_label.patch
@ -0,0 +1,38 @@
+From: Roman Kuzmitskii <damex.pp@icloud.com>
+Date: Wed, 28 Oct 2020 19:00:00 +0000
+Subject: [PATCH] staging: octeon: add net-labels support
+
+With this patch, device name can be set within dts file
+in the same way as dsa port can.
+
+Add label to pip interface node to use this feature:
+label = "lan0";
+
+Tested-by: Johannes Kimmel <fff@bareminimum.eu>
+Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
+--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
+@@ -407,9 +407,12 @@
+ {
+ 	struct octeon_ethernet *priv = netdev_priv(dev);
+ 	const u8 *mac = NULL;
+	const u8 *label = NULL;
+ 
+-	if (priv->of_node)
+	if (priv->of_node) {
+ 		mac = of_get_mac_address(priv->of_node);
+		label = of_get_property(priv->of_node, "label", NULL);
+	}
+ 
+ 	if (!IS_ERR_OR_NULL(mac))
+ 		ether_addr_copy(dev->dev_addr, mac);
+@@ -444,6 +447,9 @@
+ 	if (dev->netdev_ops->ndo_stop)
+ 		dev->netdev_ops->ndo_stop(dev);
+ 
+	if (!IS_ERR_OR_NULL(label))
+		dev_alloc_name(dev, label);
+
+ 	return 0;
+ }
+ 
--- a/target/linux/octeon/patches-5.4/701-honor_sgmii_node_device_tree_status.patch
+++ b/target/linux/octeon/patches-5.4/701-honor_sgmii_node_device_tree_status.patch
@ -0,0 +1,27 @@
+From: Roman Kuzmitskii <damex.pp@icloud.com>
+Date: Sun, 01 Nov 2020 19:00:00 +0000
+Subject: [PATCH] staging: octeon: sgmii to honor disabled dt node status
+
+With this patch, sgmii interface device tree node could be disabled and
+that disabled interface will not be unnecessarily initialized.
+
+It solves the problem with Octeon boards that have 8 sgmii or more ports
+initialized but have nothing connected to them.
+
+Tested-by: Johannes Kimmel <fff@bareminimum.eu>
+Signed-off-by: Roman Kuzmitskii <damex.pp@icloud.com>
+--- a/drivers/staging/octeon/ethernet.c
+++ b/drivers/staging/octeon/ethernet.c
+@@ -884,8 +884,10 @@
+ 
+ 			case CVMX_HELPER_INTERFACE_MODE_SGMII:
+ 				priv->phy_mode = PHY_INTERFACE_MODE_SGMII;
+-				dev->netdev_ops = &cvm_oct_sgmii_netdev_ops;
+-				strscpy(dev->name, "eth%d", sizeof(dev->name));
+				if (of_device_is_available(priv->of_node)) {
+					dev->netdev_ops = &cvm_oct_sgmii_netdev_ops;
+					strscpy(dev->name, "eth%d", sizeof(dev->name));
+				}
+ 				break;
+ 
+ 			case CVMX_HELPER_INTERFACE_MODE_SPI: