[openwrt/openwrt] kernel/kirkwood: Restore kernel files for v6.1
LEDE Commits
lede-commits at lists.infradead.org
Thu Apr 4 09:31:39 PDT 2024
robimarko pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/398fa87ef040c31397d32e514c9bc7f57579a099
commit 398fa87ef040c31397d32e514c9bc7f57579a099
Author: Pawel Dembicki <paweldembicki at gmail.com>
AuthorDate: Thu Mar 14 14:17:24 2024 +0100
kernel/kirkwood: Restore kernel files for v6.1
This is an automatically generated commit which aids following Kernel patch history,
as git will see the move and copy as a rename thus defeating the purpose.
See: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html
for the original discussion.
Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
---
target/linux/kirkwood/config-6.1 | 309 +++++++++++++++++++++
...-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch | 301 ++++++++++++++++++++
...dts-kirkwood-Add-Endian-4i-Edge-200-board.patch | 249 +++++++++++++++++
...kwood-Add-missing-phy-mode-and-fixed-link.patch | 108 +++++++
...mv88e6xxx-fix-marvell-6350-switch-probing.patch | 89 ++++++
target/linux/kirkwood/patches-6.1/100-ib62x0.patch | 53 ++++
.../linux/kirkwood/patches-6.1/101-iconnect.patch | 80 ++++++
.../linux/kirkwood/patches-6.1/102-dockstar.patch | 62 +++++
.../kirkwood/patches-6.1/103-iomega-ix2-200.patch | 71 +++++
.../patches-6.1/105-linksys-viper-dts.patch | 59 ++++
.../linux/kirkwood/patches-6.1/106-goflexnet.patch | 53 ++++
...07-01-zyxel-nsa3x0-common-nand-partitions.patch | 48 ++++
.../linux/kirkwood/patches-6.1/107-03-nsa325.patch | 54 ++++
.../kirkwood/patches-6.1/109-pogoplug_v4.patch | 87 ++++++
.../linux/kirkwood/patches-6.1/110-pogo_e02.patch | 68 +++++
target/linux/kirkwood/patches-6.1/111-l-50.patch | 47 ++++
.../kirkwood/patches-6.1/112-sheevaplug.patch | 47 ++++
.../kirkwood/patches-6.1/113-readynas_duo_v2.patch | 76 +++++
.../kirkwood/patches-6.1/114-ctera-c-200-v1.patch | 58 ++++
.../linux/kirkwood/patches-6.1/115-nsa310s.patch | 35 +++
.../kirkwood/patches-6.1/116-4i-edge-200.patch | 34 +++
.../kirkwood/patches-6.1/117-netgear_stora.patch | 10 +
...01-enable-sata-port-specific-led-triggers.patch | 10 +
.../patches-6.1/202-linksys-find-active-root.patch | 62 +++++
.../patches-6.1/203-blackarmor-nas220.patch | 99 +++++++
25 files changed, 2169 insertions(+)
diff --git a/target/linux/kirkwood/config-6.1 b/target/linux/kirkwood/config-6.1
new file mode 100644
index 0000000000..6d21143e96
--- /dev/null
+++ b/target/linux/kirkwood/config-6.1
@@ -0,0 +1,309 @@
+CONFIG_ALIGNMENT_TRAP=y
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_KEEP_MEMBLOCK=y
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_CPU_AUTO=y
+# CONFIG_ARCH_MULTI_V4 is not set
+# CONFIG_ARCH_MULTI_V4T is not set
+CONFIG_ARCH_MULTI_V4_V5=y
+CONFIG_ARCH_MULTI_V5=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_NR_GPIO=0
+CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARM=y
+# CONFIG_ARMADA_37XX_WATCHDOG is not set
+# CONFIG_ARMADA_THERMAL is not set
+CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
+CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
+CONFIG_ARM_HAS_GROUP_RELOCS=y
+# CONFIG_ARM_KIRKWOOD_CPUIDLE is not set
+CONFIG_ARM_L1_CACHE_SHIFT=5
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
+CONFIG_ARM_PATCH_PHYS_VIRT=y
+# CONFIG_ARM_THUMB is not set
+CONFIG_ARM_UNWIND=y
+CONFIG_ATA=y
+CONFIG_ATAGS=y
+CONFIG_ATA_LEDS=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_CACHE_FEROCEON_L2=y
+# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
+CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y
+CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
+CONFIG_CC_NO_ARRAY_BOUNDS=y
+CONFIG_CLKSRC_MMIO=y
+CONFIG_CLONE_BACKWARDS=y
+CONFIG_COMMON_CLK=y
+CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5T=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_FEROCEON=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+CONFIG_CPU_FEROCEON=y
+# CONFIG_CPU_FEROCEON_OLD_ID is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_CPU_PABRT_LEGACY=y
+CONFIG_CPU_PM=y
+CONFIG_CPU_THERMAL=y
+CONFIG_CPU_THUMB_CAPABLE=y
+CONFIG_CPU_TLB_FEROCEON=y
+CONFIG_CPU_USE_DOMAINS=y
+CONFIG_CRC16=y
+# CONFIG_CRC32_SARWATE is not set
+CONFIG_CRC32_SLICEBY8=y
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_DEV_MARVELL=y
+CONFIG_CRYPTO_DEV_MARVELL_CESA=y
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_DES=y
+CONFIG_CRYPTO_LIB_SHA1=y
+CONFIG_CRYPTO_LIB_UTILS=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_LL=y
+CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
+CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y
+# CONFIG_DEBUG_MVEBU_UART1_ALTERNATE is not set
+CONFIG_DEBUG_UART_8250=y
+CONFIG_DEBUG_UART_8250_SHIFT=2
+CONFIG_DEBUG_UART_PHYS=0xf1012000
+CONFIG_DEBUG_UART_VIRT=0xfed12000
+CONFIG_DMA_OPS=y
+CONFIG_DNOTIFY=y
+CONFIG_DTC=y
+# CONFIG_EARLY_PRINTK is not set
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+CONFIG_FIXED_PHY=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_FORCE_PCI=y
+CONFIG_FWNODE_MDIO=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_FW_LOADER_SYSFS=y
+CONFIG_GCC11_NO_ARRAY_BOUNDS=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_GENERIC_ATOMIC64=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_EARLY_IOREMAP=y
+CONFIG_GENERIC_IDLE_POLL_SETUP=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
+CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_PHY=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_GENERIC_SCHED_CLOCK=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GLOB=y
+CONFIG_GPIOLIB_IRQCHIP=y
+CONFIG_GPIO_CDEV=y
+CONFIG_GPIO_MVEBU=y
+CONFIG_GRO_CELLS=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_HAS_DMA=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HWMON=y
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_OMAP=y
+CONFIG_HZ_FIXED=0
+CONFIG_HZ_PERIODIC=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MV64XXX=y
+# CONFIG_I2C_PXA is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_IRQCHIP=y
+CONFIG_IRQSTACKS=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_IRQ_WORK=y
+CONFIG_KIRKWOOD_CLK=y
+CONFIG_KIRKWOOD_THERMAL=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_NETXBIG=y
+CONFIG_LEDS_NS2=y
+CONFIG_LIBFDT=y
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_MVEBU_ANY=y
+CONFIG_MANGLE_BOOTARGS=y
+CONFIG_MARVELL_PHY=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_DEVRES=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_MIGRATION=y
+CONFIG_MODULES_USE_ELF_REL=y
+# CONFIG_MTD_CFI is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_NAND_ECC=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=y
+# CONFIG_MTD_NAND_MARVELL is not set
+CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_MTD_SPI_NOR=y
+CONFIG_MTD_SPLIT_FIRMWARE=y
+CONFIG_MTD_SPLIT_UIMAGE_FW=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MV643XX_ETH=y
+CONFIG_MVEBU_CLK_COMMON=y
+CONFIG_MVEBU_MBUS=y
+CONFIG_MVMDIO=y
+# CONFIG_MVNETA is not set
+# CONFIG_MVPP2 is not set
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_NEED_KUSER_HELPERS=y
+CONFIG_NEED_PER_CPU_KM=y
+CONFIG_NET_DEVLINK=y
+CONFIG_NET_DSA=y
+CONFIG_NET_DSA_MV88E6XXX=y
+CONFIG_NET_DSA_TAG_DSA=y
+CONFIG_NET_DSA_TAG_DSA_COMMON=y
+CONFIG_NET_DSA_TAG_EDSA=y
+CONFIG_NET_SELFTESTS=y
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NLS=y
+CONFIG_NVMEM=y
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_IRQ=y
+CONFIG_OF_KOBJ=y
+CONFIG_OF_MDIO=y
+CONFIG_OLD_SIGACTION=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_ORION_IRQCHIP=y
+CONFIG_ORION_TIMER=y
+CONFIG_ORION_WATCHDOG=y
+CONFIG_OUTER_CACHE=y
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PAGE_POOL=y
+CONFIG_PAGE_SIZE_LESS_THAN_256KB=y
+CONFIG_PAGE_SIZE_LESS_THAN_64KB=y
+CONFIG_PCI=y
+CONFIG_PCI_BRIDGE_EMUL=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_DOMAINS_GENERIC=y
+CONFIG_PCI_MVEBU=y
+CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PGTABLE_LEVELS=2
+CONFIG_PHYLIB=y
+CONFIG_PHYLINK=y
+# CONFIG_PHY_MVEBU_A3700_UTMI is not set
+# CONFIG_PHY_MVEBU_A38X_COMPHY is not set
+CONFIG_PHY_MVEBU_SATA=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_KIRKWOOD=y
+CONFIG_PINCTRL_MVEBU=y
+# CONFIG_PINCTRL_SINGLE is not set
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PLAT_ORION=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_POWER_RESET_LINKSTATION=y
+CONFIG_POWER_SUPPLY=y
+CONFIG_PREEMPT_NONE_BUILD=y
+CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_RANDSTRUCT_NONE=y
+CONFIG_RATIONAL=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_MV=y
+CONFIG_RTC_I2C_AND_SPI=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_SCSI=y
+CONFIG_SCSI_COMMON=y
+CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
+CONFIG_SERIAL_8250_FSL=y
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_MVEBU_UART is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SGL_ALLOC=y
+CONFIG_SG_POOL=y
+CONFIG_SOC_BUS=y
+CONFIG_SOFTIRQ_ON_OWN_STACK=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_SPI=y
+# CONFIG_SPI_ARMADA_3700 is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+CONFIG_SPI_ORION=y
+CONFIG_SPLIT_PTLOCK_CPUS=999999
+CONFIG_SRAM=y
+CONFIG_SRAM_EXEC=y
+CONFIG_SRCU=y
+CONFIG_SWPHY=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_THERMAL=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
+CONFIG_THREAD_INFO_IN_TASK=y
+CONFIG_TICK_CPU_ACCOUNTING=y
+CONFIG_TIMER_OF=y
+CONFIG_TIMER_PROBE=y
+CONFIG_TINY_SRCU=y
+CONFIG_UBIFS_FS=y
+CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
+CONFIG_UNWINDER_ARM=y
+CONFIG_USB=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USE_OF=y
+# CONFIG_VFP is not set
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_WAN=y
+CONFIG_WATCHDOG_CORE=y
+CONFIG_XXHASH=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZSTD_COMMON=y
+CONFIG_ZSTD_COMPRESS=y
+CONFIG_ZSTD_DECOMPRESS=y
diff --git a/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch b/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch
new file mode 100644
index 0000000000..09e71813cd
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch
@@ -0,0 +1,301 @@
+From e977a103840c57d72b52cbc8c17f87f86ef9aa8d Mon Sep 17 00:00:00 2001
+From: Pawel Dembicki <paweldembicki at gmail.com>
+Date: Sat, 29 Oct 2022 22:57:38 +0200
+Subject: [PATCH] ARM: dts: kirkwood: Add Zyxel NSA310S board
+
+Zyxel NSA310S is a NAS based on Marvell kirkwood SoC.
+
+Specification:
+ - Processor Marvell 88F6702 1 GHz
+ - 256MB RAM
+ - 128MB NAND
+ - 1x GBE LAN port (PHY: Marvell 88E1318)
+ - 2x USB 2.0
+ - 1x SATA
+ - 3x button
+ - 7x leds
+ - serial on J1 connector (115200 8N1) (GND-NOPIN-RX-TX-VCC)
+
+Tested-by: Tony Dinh <mibodhi at gmail.com>
+Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
+Acked-by: Adam Baker <linux at baker-net.org.uk>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at bootlin.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/kirkwood-nsa310s.dts | 259 +++++++++++++++++++++++++
+ 2 files changed, 260 insertions(+)
+ create mode 100644 arch/arm/boot/dts/kirkwood-nsa310s.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -356,6 +356,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-ns2mini.dtb \
+ kirkwood-nsa310.dtb \
+ kirkwood-nsa310a.dtb \
++ kirkwood-nsa310s.dtb \
+ kirkwood-nsa320.dtb \
+ kirkwood-nsa325.dtb \
+ kirkwood-openblocks_a6.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/kirkwood-nsa310s.dts
+@@ -0,0 +1,259 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * ZyXEL NSA310S Board Description
++ * Copyright 2020-2022 Pawel Dembicki <paweldembicki at gmail.com>
++ * Copyright (c) 2015-2021, Tony Dinh <mibodhi at gmail.com>
++ * Copyright (c) 2014, Adam Baker <linux at baker-net.org.uk>
++ * Based upon the board setup file created by Peter Schildmann
++ */
++/dts-v1/;
++
++#include "kirkwood.dtsi"
++#include "kirkwood-6281.dtsi"
++#include <dt-bindings/leds/common.h>
++
++/ {
++ model = "ZyXEL NSA310S";
++ compatible = "zyxel,nsa310s", "marvell,kirkwood-88f6702", "marvell,kirkwood";
++
++ memory {
++ device_type = "memory";
++ reg = <0x00000000 0x10000000>;
++ };
++
++ chosen {
++ bootargs = "console=ttyS0,115200n8 earlyprintk";
++ stdout-path = &uart0;
++ };
++
++ gpio_poweroff {
++ compatible = "gpio-poweroff";
++ pinctrl-0 = <&pmx_pwr_off>;
++ pinctrl-names = "default";
++ gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
++ };
++
++ keys {
++ compatible = "gpio-keys";
++ #address-cells = <1>;
++ #size-cells = <0>;
++ pinctrl-0 = <&pmx_buttons>;
++ pinctrl-names = "default";
++
++ power {
++ label = "Power Button";
++ linux,code = <KEY_POWER>;
++ gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
++ };
++
++ copy {
++ label = "Copy Button";
++ linux,code = <KEY_COPY>;
++ gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
++ };
++
++ reset {
++ label = "Reset Button";
++ linux,code = <KEY_RESTART>;
++ gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
++ };
++ };
++
++ leds {
++ compatible = "gpio-leds";
++ pinctrl-0 = <&pmx_leds>;
++ pinctrl-names = "default";
++
++ led-1 {
++ function = LED_FUNCTION_DISK_ERR;
++ color = <LED_COLOR_ID_RED>;
++ gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
++ };
++
++ led-2 {
++ function = LED_FUNCTION_USB;
++ color = <LED_COLOR_ID_GREEN>;
++ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "usb-host";
++ };
++
++ led-3 {
++ function = LED_FUNCTION_DISK;
++ color = <LED_COLOR_ID_GREEN>;
++ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "ata1";
++ };
++
++ led-4 {
++ function = LED_FUNCTION_INDICATOR;
++ color = <LED_COLOR_ID_GREEN>;
++ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
++ };
++
++ led-5 {
++ function = LED_FUNCTION_INDICATOR;
++ color = <LED_COLOR_ID_RED>;
++ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
++ };
++
++ led-6 {
++ function = LED_FUNCTION_STATUS;
++ color = <LED_COLOR_ID_GREEN>;
++ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "default-on";
++ };
++
++ led-7 {
++ function = LED_FUNCTION_STATUS;
++ color = <LED_COLOR_ID_RED>;
++ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
++ };
++ };
++
++ usb0_power: regulator at 1 {
++ compatible = "regulator-fixed";
++ regulator-name = "USB Power";
++
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ regulator-always-on;
++ regulator-boot-on;
++ gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
++ };
++
++ sata1_power: regulator at 2 {
++ compatible = "regulator-fixed";
++ regulator-name = "SATA1 Power";
++
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ regulator-always-on;
++ regulator-boot-on;
++ gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>;
++ };
++
++ thermal-zones {
++ disk-thermal {
++ polling-delay = <20000>;
++ polling-delay-passive = <2000>;
++
++ thermal-sensors = <&hdd_temp>;
++
++ trips {
++ disk_alert: disk-alert {
++ temperature = <40000>;
++ hysteresis = <5000>;
++ type = "active";
++ };
++ disk_crit: disk-crit {
++ temperature = <60000>;
++ hysteresis = <2000>;
++ type = "critical";
++ };
++ };
++ };
++ };
++};
++
++
++ð0 {
++ status = "okay";
++
++ ethernet0-port at 0 {
++ phy-handle = <ðphy0>;
++ };
++};
++
++&i2c0 {
++ status = "okay";
++
++ rtc at 68 {
++ compatible = "htk,ht1382";
++ reg = <0x68>;
++ };
++};
++
++&mdio {
++ status = "okay";
++
++ ethphy0: ethernet-phy at 1 {
++ reg = <1>;
++ phy-mode = "rgmii-id";
++ marvell,reg-init = <0x1 0x16 0x0 0x3>,
++ <0x1 0x10 0x0 0x1017>,
++ <0x1 0x11 0x0 0x4408>,
++ <0x1 0x16 0x0 0x0>;
++ };
++};
++
++&nand {
++ status = "okay";
++ chip-delay = <35>;
++
++ partition at 0 {
++ label = "uboot";
++ reg = <0x0000000 0x00c0000>;
++ read-only;
++ };
++ partition at c0000 {
++ label = "uboot_env";
++ reg = <0x00c0000 0x0080000>;
++ };
++ partition at 140000 {
++ label = "ubi";
++ reg = <0x0140000 0x7ec0000>;
++ };
++};
++
++&pciec {
++ status = "okay";
++};
++
++&pcie0 {
++ status = "okay";
++};
++
++&pinctrl {
++ pinctrl-names = "default";
++
++ pmx_buttons: pmx-buttons {
++ marvell,pins = "mpp24", "mpp25", "mpp26";
++ marvell,function = "gpio";
++ };
++
++ pmx_leds: pmx-leds {
++ marvell,pins = "mpp13", "mpp15", "mpp16", "mpp22", "mpp23",
++ "mpp28", "mpp29";
++ marvell,function = "gpio";
++ };
++
++ pmx_power: pmx-power {
++ marvell,pins = "mpp21", "mpp33";
++ marvell,function = "gpio";
++ };
++
++ pmx_pwr_off: pmx-pwr-off {
++ marvell,pins = "mpp27";
++ marvell,function = "gpio";
++ };
++};
++
++&rtc {
++ status = "disabled";
++};
++
++&sata {
++ status = "okay";
++ nr-ports = <1>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ hdd_temp: sata-port at 0 {
++ reg = <0>;
++ #thermal-sensor-cells = <0>;
++ };
++};
++
++&uart0 {
++ status = "okay";
++};
diff --git a/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch b/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch
new file mode 100644
index 0000000000..cde281526b
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch
@@ -0,0 +1,249 @@
+From 5668d088ee4ea05db9daaae0645d1d1f579b20f9 Mon Sep 17 00:00:00 2001
+From: Pawel Dembicki <paweldembicki at gmail.com>
+Date: Mon, 3 Oct 2022 09:34:43 +0200
+Subject: ARM: dts: kirkwood: Add Endian 4i Edge 200 board
+
+Add Endian 4i Edge 200 is 5-port firewall.
+It have also clone: Endian UTM Mini (The same hardware, with added WLAN
+card).
+
+Hardware:
+ - SoC: Marvell 88F6281-A1 ARMv5TE Processor 1.2GHz
+ - Ram: 512MB (4x Nanya NT5TU128M8GE-AC)
+ - NAND Flash: 512MB (Micron 29F4G08AAC)
+ - Lan 1-4: 4x GBE (Marvell 88E6171R-TFJ2)
+ - Lan 5: 1x GBE (Marvell 88E1116R-NNC1)
+ - Storage: MicroSD Slot
+ - MCPIE: MiniPCIe Slot present [fitted with SparkLan WPEA-110N/E
+ (Atheros AR9280 chipset) in Endian UTM Mini WLAN only]
+ - USB: 1x USB 2.0 port
+ - Console: RJ-45 port
+ - LEDs: 3x GPIO controlled
+
+Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at bootlin.com>
+---
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/kirkwood-4i-edge-200.dts | 205 +++++++++++++++++++++++++++++
+ 2 files changed, 206 insertions(+)
+ create mode 100644 arch/arm/boot/dts/kirkwood-4i-edge-200.dts
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -300,6 +300,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \
+ keystone-k2g-evm.dtb \
+ keystone-k2g-ice.dtb
+ dtb-$(CONFIG_MACH_KIRKWOOD) += \
++ kirkwood-4i-edge-200.dtb \
+ kirkwood-b3.dtb \
+ kirkwood-blackarmor-nas220.dtb \
+ kirkwood-c200-v1.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/kirkwood-4i-edge-200.dts
+@@ -0,0 +1,205 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Endian 4i Edge 200 Board Description
++ * Note: Endian UTM Mini is hardware clone of Endian Edge 200
++ * Copyright 2021-2022 Pawel Dembicki <paweldembicki at gmail.com>
++ */
++
++/dts-v1/;
++
++#include "kirkwood.dtsi"
++#include "kirkwood-6281.dtsi"
++#include <dt-bindings/leds/common.h>
++
++/ {
++ model = "Endian 4i Edge 200";
++ compatible = "endian,4i-edge-200", "marvell,kirkwood-88f6281", "marvell,kirkwood";
++
++ memory {
++ device_type = "memory";
++ reg = <0x00000000 0x20000000>;
++ };
++
++ chosen {
++ bootargs = "console=ttyS0,115200n8";
++ stdout-path = &uart0;
++ };
++
++ leds {
++ compatible = "gpio-leds";
++ pinctrl-0 = <&pmx_led>;
++ pinctrl-names = "default";
++
++ led-1 {
++ function = LED_FUNCTION_SD;
++ color = <LED_COLOR_ID_AMBER>;
++ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "mmc0";
++ };
++
++ led-2 {
++ function = LED_FUNCTION_STATUS;
++ color = <LED_COLOR_ID_AMBER>;
++ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
++ };
++
++ led-3 {
++ function = LED_FUNCTION_STATUS;
++ color = <LED_COLOR_ID_GREEN>;
++ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
++ };
++ };
++};
++
++ð0 {
++ status = "okay";
++};
++
++ð0port {
++ speed = <1000>;
++ duplex = <1>;
++};
++
++ð1 {
++ status = "okay";
++};
++
++ð1port {
++ phy-handle = <ðphyb>;
++};
++
++&mdio {
++ status = "okay";
++
++ ethphyb: ethernet-phy at b {
++ reg = <0x0b>;
++
++ marvell,reg-init =
++ /* link-activity, bi-color mode 4 */
++ <3 0x10 0xfff0 0xf>; /* Reg 3,16 <- 0xzzzf */
++ };
++
++ switch0: switch at 11 {
++ compatible = "marvell,mv88e6085";
++ reg = <0x11>;
++
++ ports {
++ #address-cells = <1>;
++ #size-cells = <0>;
++
++ port at 0 {
++ reg = <0>;
++ label = "port1";
++ };
++
++ port at 1 {
++ reg = <1>;
++ label = "port2";
++ };
++
++ port at 2 {
++ reg = <2>;
++ label = "port3";
++ };
++
++ port at 3 {
++ reg = <3>;
++ label = "port4";
++ };
++
++ port at 5 {
++ reg = <5>;
++ phy-mode = "rgmii-id";
++ ethernet = <ð0port>;
++
++ fixed-link {
++ speed = <1000>;
++ full-duplex;
++ };
++ };
++ };
++ };
++};
++
++&nand {
++ status = "okay";
++ pinctrl-0 = <&pmx_nand>;
++ pinctrl-names = "default";
++
++ partition at 0 {
++ label = "u-boot";
++ reg = <0x00000000 0x000a0000>;
++ read-only;
++ };
++
++ partition at a0000 {
++ label = "u-boot-env";
++ reg = <0x000a0000 0x00060000>;
++ read-only;
++ };
++
++ partition at 100000 {
++ label = "kernel";
++ reg = <0x00100000 0x00400000>;
++ };
++
++ partition at 500000 {
++ label = "ubi";
++ reg = <0x00500000 0x1fb00000>;
++ };
++};
++
++&pciec {
++ status = "okay";
++};
++
++&pcie0 {
++ status = "okay";
++};
++
++&pinctrl {
++ pinctrl-0 = <&pmx_sysrst>;
++ pinctrl-names = "default";
++
++ pmx_sysrst: pmx-sysrst {
++ marvell,pins = "mpp6";
++ marvell,function = "sysrst";
++ };
++
++ pmx_sdio_cd: pmx-sdio-cd {
++ marvell,pins = "mpp28";
++ marvell,function = "gpio";
++ };
++
++ pmx_led: pmx-led {
++ marvell,pins = "mpp34", "mpp35", "mpp49";
++ marvell,function = "gpio";
++ };
++};
++
++&rtc {
++ status = "okay";
++};
++
++&sata_phy0 {
++ status = "disabled";
++};
++
++&sata_phy1 {
++ status = "disabled";
++};
++
++&sdio {
++ pinctrl-0 = <&pmx_sdio_cd>;
++ pinctrl-names = "default";
++ status = "okay";
++ cd-gpios = <&gpio0 28 9>;
++};
++
++&uart0 {
++ status = "okay";
++};
++
++&usb0 {
++ status = "okay";
++};
diff --git a/target/linux/kirkwood/patches-6.1/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch b/target/linux/kirkwood/patches-6.1/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch
new file mode 100644
index 0000000000..fd7adc3584
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/004-6.4-ARM-dts-kirkwood-Add-missing-phy-mode-and-fixed-link.patch
@@ -0,0 +1,108 @@
+From 8aea8659a5f3ae8dc63c9f632ce1f676a1483556 Mon Sep 17 00:00:00 2001
+From: Andrew Lunn <andrew at lunn.ch>
+Date: Fri, 7 Apr 2023 17:17:20 +0200
+Subject: [PATCH] ARM: dts: kirkwood: Add missing phy-mode and fixed links
+
+The DSA framework has got more picky about always having a phy-mode
+for the CPU port. The Kirkwood Ethernet is an RGMII port. Set the
+switch to impose the RGMII delays.
+
+Additionally, the cpu label has never actually been used in the
+binding, so remove it.
+
+Signed-off-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at bootlin.com>
+---
+ arch/arm/boot/dts/kirkwood-dir665.dts | 3 ++-
+ arch/arm/boot/dts/kirkwood-l-50.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-linksys-viper.dts | 3 ++-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 3 ++-
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 2 +-
+ 5 files changed, 8 insertions(+), 5 deletions(-)
+
+--- a/arch/arm/boot/dts/kirkwood-dir665.dts
++++ b/arch/arm/boot/dts/kirkwood-dir665.dts
+@@ -232,7 +232,7 @@
+
+ port at 6 {
+ reg = <6>;
+- label = "cpu";
++ phy-mode = "rgmii-id";
+ ethernet = <ð0port>;
+ fixed-link {
+ speed = <1000>;
+@@ -251,6 +251,7 @@
+ ethernet0-port at 0 {
+ speed = <1000>;
+ duplex = <1>;
++ phy-mode = "rgmii";
+ };
+ };
+
+--- a/arch/arm/boot/dts/kirkwood-l-50.dts
++++ b/arch/arm/boot/dts/kirkwood-l-50.dts
+@@ -254,7 +254,6 @@
+
+ port at 6 {
+ reg = <6>;
+- label = "cpu";
+ phy-mode = "rgmii-id";
+ ethernet = <ð1port>;
+ fixed-link {
+@@ -330,6 +329,7 @@
+ ethernet1-port at 0 {
+ speed = <1000>;
+ duplex = <1>;
++ phy-mode = "rgmii";
+ };
+ };
+
+--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
++++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+@@ -198,7 +198,7 @@
+
+ port at 5 {
+ reg = <5>;
+- label = "cpu";
++ phy-mode = "rgmii-id";
+ ethernet = <ð0port>;
+ fixed-link {
+ speed = <1000>;
+@@ -221,6 +221,7 @@
+ ethernet0-port at 0 {
+ speed = <1000>;
+ duplex = <1>;
++ phy-mode = "rgmii";
+ };
+ };
+
+--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
++++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+@@ -149,7 +149,7 @@
+
+ port at 5 {
+ reg = <5>;
+- label = "cpu";
++ phy-mode = "rgmii-id";
+ ethernet = <ð0port>;
+ fixed-link {
+ speed = <1000>;
+@@ -166,6 +166,7 @@
+ ethernet0-port at 0 {
+ speed = <1000>;
+ duplex = <1>;
++ phy-mode = "rgmii";
+ };
+ };
+
+--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
++++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+@@ -105,7 +105,7 @@
+
+ port at 5 {
+ reg = <5>;
+- label = "cpu";
++ phy-mode = "rgmii-id";
+ ethernet = <ð0port>;
+ fixed-link {
+ speed = <1000>;
diff --git a/target/linux/kirkwood/patches-6.1/005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch b/target/linux/kirkwood/patches-6.1/005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch
new file mode 100644
index 0000000000..cd838394d9
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/005-6.7-net-dsa-mv88e6xxx-fix-marvell-6350-switch-probing.patch
@@ -0,0 +1,89 @@
+From b3f1a164c7f742503dc7159011f7ad6b092b660e Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg at kernel.org>
+Date: Fri, 24 Nov 2023 14:15:28 +1000
+Subject: [PATCH] net: dsa: mv88e6xxx: fix marvell 6350 switch probing
+
+As of commit de5c9bf40c45 ("net: phylink: require supported_interfaces to
+be filled") Marvell 88e6350 switches fail to be probed:
+
+ ...
+ mv88e6085 d0072004.mdio-mii:11: switch 0x3710 detected: Marvell 88E6350, revision 2
+ mv88e6085 d0072004.mdio-mii:11: phylink: error: empty supported_interfaces
+ error creating PHYLINK: -22
+ mv88e6085: probe of d0072004.mdio-mii:11 failed with error -22
+ ...
+
+The problem stems from the use of mv88e6185_phylink_get_caps() to get
+the device capabilities. Create a new dedicated phylink_get_caps for the
+6351 family (which the 6350 is one of) to properly support their set of
+capabilities.
+
+According to chip.h the 6351 switch family includes the 6171, 6175, 6350
+and 6351 switches, so update each of these to use the correct
+phylink_get_caps.
+
+Fixes: de5c9bf40c45 ("net: phylink: require supported_interfaces to be filled")
+Signed-off-by: Greg Ungerer <gerg at kernel.org>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ drivers/net/dsa/mv88e6xxx/chip.c | 20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/dsa/mv88e6xxx/chip.c
++++ b/drivers/net/dsa/mv88e6xxx/chip.c
+@@ -652,6 +652,18 @@ static void mv88e6250_phylink_get_caps(s
+ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100;
+ }
+
++static void mv88e6351_phylink_get_caps(struct mv88e6xxx_chip *chip, int port,
++ struct phylink_config *config)
++{
++ unsigned long *supported = config->supported_interfaces;
++
++ /* Translate the default cmode */
++ mv88e6xxx_translate_cmode(chip->ports[port].cmode, supported);
++
++ config->mac_capabilities = MAC_SYM_PAUSE | MAC_10 | MAC_100 |
++ MAC_1000FD;
++}
++
+ static int mv88e6352_get_port4_serdes_cmode(struct mv88e6xxx_chip *chip)
+ {
+ u16 reg, val;
+@@ -4498,7 +4510,7 @@ static const struct mv88e6xxx_ops mv88e6
+ .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+ .stu_getnext = mv88e6352_g1_stu_getnext,
+ .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
+- .phylink_get_caps = mv88e6185_phylink_get_caps,
++ .phylink_get_caps = mv88e6351_phylink_get_caps,
+ };
+
+ static const struct mv88e6xxx_ops mv88e6172_ops = {
+@@ -4599,7 +4611,7 @@ static const struct mv88e6xxx_ops mv88e6
+ .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+ .stu_getnext = mv88e6352_g1_stu_getnext,
+ .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
+- .phylink_get_caps = mv88e6185_phylink_get_caps,
++ .phylink_get_caps = mv88e6351_phylink_get_caps,
+ };
+
+ static const struct mv88e6xxx_ops mv88e6176_ops = {
+@@ -5256,7 +5268,7 @@ static const struct mv88e6xxx_ops mv88e6
+ .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge,
+ .stu_getnext = mv88e6352_g1_stu_getnext,
+ .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
+- .phylink_get_caps = mv88e6185_phylink_get_caps,
++ .phylink_get_caps = mv88e6351_phylink_get_caps,
+ };
+
+ static const struct mv88e6xxx_ops mv88e6351_ops = {
+@@ -5302,7 +5314,7 @@ static const struct mv88e6xxx_ops mv88e6
+ .stu_loadpurge = mv88e6352_g1_stu_loadpurge,
+ .avb_ops = &mv88e6352_avb_ops,
+ .ptp_ops = &mv88e6352_ptp_ops,
+- .phylink_get_caps = mv88e6185_phylink_get_caps,
++ .phylink_get_caps = mv88e6351_phylink_get_caps,
+ };
+
+ static const struct mv88e6xxx_ops mv88e6352_ops = {
diff --git a/target/linux/kirkwood/patches-6.1/100-ib62x0.patch b/target/linux/kirkwood/patches-6.1/100-ib62x0.patch
new file mode 100644
index 0000000000..0637c24b63
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/100-ib62x0.patch
@@ -0,0 +1,53 @@
+--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
++++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
+@@ -6,7 +6,14 @@
+
+ / {
+ model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
+- compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
++ compatible = "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
++
++ aliases {
++ led-boot = &led_green_os;
++ led-failsafe = &led_red_os;
++ led-running = &led_green_os;
++ led-upgrade = &led_red_os;
++ };
+
+ memory {
+ device_type = "memory";
+@@ -81,12 +88,12 @@
+ &pmx_led_usb_transfer>;
+ pinctrl-names = "default";
+
+- green-os {
++ led_green_os: green-os {
+ label = "ib62x0:green:os";
+ gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
+- default-state = "keep";
++ default-state = "on";
+ };
+- red-os {
++ led_red_os: red-os {
+ label = "ib62x0:red:os";
+ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+ };
+@@ -118,13 +125,13 @@
+ };
+
+ partition at 100000 {
+- label = "uImage";
+- reg = <0x0100000 0x600000>;
++ label = "second stage u-boot";
++ reg = <0x100000 0x200000>;
+ };
+
+- partition at 700000 {
+- label = "root";
+- reg = <0x0700000 0xf900000>;
++ partition at 200000 {
++ label = "ubi";
++ reg = <0x200000 0xfe00000>;
+ };
+
+ };
diff --git a/target/linux/kirkwood/patches-6.1/101-iconnect.patch b/target/linux/kirkwood/patches-6.1/101-iconnect.patch
new file mode 100644
index 0000000000..935e2dfcf5
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/101-iconnect.patch
@@ -0,0 +1,80 @@
+--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
++++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
+@@ -8,6 +8,13 @@
+ model = "Iomega Iconnect";
+ compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_power_blue;
++ led-failsafe = &led_power_red;
++ led-running = &led_power_blue;
++ led-upgrade = &led_power_red;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+@@ -16,8 +23,6 @@
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+- linux,initrd-start = <0x4500040>;
+- linux,initrd-end = <0x4800000>;
+ };
+
+ ocp at f1000000 {
+@@ -89,12 +94,12 @@
+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ };
+- power-blue {
++ led_power_blue: power-blue {
+ label = "power:blue";
+ gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
+- default-state = "keep";
++ default-state = "on";
+ };
+- power-red {
++ led_power_red: power-red {
+ label = "power:red";
+ gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
+ };
+@@ -146,28 +151,23 @@
+ status = "okay";
+
+ partition at 0 {
+- label = "uboot";
+- reg = <0x0000000 0xc0000>;
++ label = "u-boot";
++ reg = <0x0000000 0xe0000>;
+ };
+
+- partition at a0000 {
+- label = "env";
+- reg = <0xa0000 0x20000>;
++ partition at e0000 {
++ label = "u-boot environment";
++ reg = <0xe0000 0x100000>;
+ };
+
+ partition at 100000 {
+- label = "zImage";
+- reg = <0x100000 0x300000>;
+- };
+-
+- partition at 540000 {
+- label = "initrd";
+- reg = <0x540000 0x300000>;
++ label = "second stage u-boot";
++ reg = <0x100000 0x200000>;
+ };
+
+- partition at 980000 {
+- label = "boot";
+- reg = <0x980000 0x1f400000>;
++ partition at 200000 {
++ label = "ubi";
++ reg = <0x200000 0x1fe00000>;
+ };
+ };
+
diff --git a/target/linux/kirkwood/patches-6.1/102-dockstar.patch b/target/linux/kirkwood/patches-6.1/102-dockstar.patch
new file mode 100644
index 0000000000..127f84962c
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/102-dockstar.patch
@@ -0,0 +1,62 @@
+--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
++++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
+@@ -8,6 +8,13 @@
+ model = "Seagate FreeAgent Dockstar";
+ compatible = "seagate,dockstar", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_health;
++ led-failsafe = &led_fault;
++ led-running = &led_health;
++ led-upgrade = &led_fault;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x8000000>;
+@@ -42,12 +49,12 @@
+ pinctrl-0 = <&pmx_led_green &pmx_led_orange>;
+ pinctrl-names = "default";
+
+- health {
++ led_health: health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+- default-state = "keep";
++ default-state = "on";
+ };
+- fault {
++ led_fault: fault {
+ label = "status:orange:fault";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+@@ -78,18 +85,22 @@
+
+ partition at 0 {
+ label = "u-boot";
+- reg = <0x0000000 0x100000>;
+- read-only;
++ reg = <0x0000000 0xe0000>;
++ };
++
++ partition at e0000 {
++ label = "u-boot environment";
++ reg = <0xe0000 0x100000>;
+ };
+
+ partition at 100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
++ label = "second stage u-boot";
++ reg = <0x100000 0x200000>;
+ };
+
+- partition at 500000 {
+- label = "data";
+- reg = <0x0500000 0xfb00000>;
++ partition at 200000 {
++ label = "ubi";
++ reg = <0x200000 0xfe00000>;
+ };
+ };
+
diff --git a/target/linux/kirkwood/patches-6.1/103-iomega-ix2-200.patch b/target/linux/kirkwood/patches-6.1/103-iomega-ix2-200.patch
new file mode 100644
index 0000000000..db04c09f76
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/103-iomega-ix2-200.patch
@@ -0,0 +1,71 @@
+--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
++++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+@@ -8,6 +8,13 @@
+ model = "Iomega StorCenter ix2-200";
+ compatible = "iom,ix2-200", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_power;
++ led-failsafe = &led_health;
++ led-running = &led_power;
++ led-upgrade = &led_health;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+@@ -127,16 +134,16 @@
+ &pmx_led_rebuild &pmx_led_health >;
+ pinctrl-names = "default";
+
+- power_led {
++ led_power: power_led {
+ label = "status:white:power_led";
+ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+- default-state = "keep";
++ default-state = "on";
+ };
+ rebuild_led {
+ label = "status:white:rebuild_led";
+ gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
+ };
+- health_led {
++ led_health: health_led {
+ label = "status:red:health_led";
+ gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
+ };
+@@ -186,19 +193,19 @@
+ };
+
+ partition at a0000 {
+- label = "env";
++ label = "u-boot environment";
+ reg = <0xa0000 0x20000>;
+ read-only;
+ };
+
+ partition at 100000 {
+- label = "uImage";
+- reg = <0x100000 0x300000>;
++ label = "kernel";
++ reg = <0x100000 0x400000>;
+ };
+
+- partition at 400000 {
+- label = "rootfs";
+- reg = <0x400000 0x1C00000>;
++ partition at 500000 {
++ label = "ubi";
++ reg = <0x500000 0x1C00000>;
+ };
+ };
+
+@@ -211,7 +218,7 @@
+ };
+
+ ð0 {
+- status = "okay";
++ status = "disabled";
+ ethernet0-port at 0 {
+ speed = <1000>;
+ duplex = <1>;
diff --git a/target/linux/kirkwood/patches-6.1/105-linksys-viper-dts.patch b/target/linux/kirkwood/patches-6.1/105-linksys-viper-dts.patch
new file mode 100644
index 0000000000..b1604ec92c
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/105-linksys-viper-dts.patch
@@ -0,0 +1,59 @@
+--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
++++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+@@ -24,6 +24,10 @@
+ };
+
+ aliases {
++ led-boot = &led_white_health;
++ led-failsafe = &led_white_health;
++ led-running = &led_white_health;
++ led-upgrade = &led_white_health;
+ serial0 = &uart0;
+ };
+
+@@ -56,9 +60,10 @@
+ pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
+ pinctrl-names = "default";
+
+- white-health {
++ led_white_health: white-health {
+ label = "viper:white:health";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
++ default-state = "on";
+ };
+
+ white-pulse {
+@@ -114,23 +119,23 @@
+ };
+
+ partition at 200000 {
+- label = "kernel";
+- reg = <0x200000 0x2A0000>;
++ label = "kernel1";
++ reg = <0x200000 0x1A00000>;
+ };
+
+- partition at 4a0000 {
+- label = "rootfs";
+- reg = <0x4A0000 0x1760000>;
++ partition at 600000 {
++ label = "rootfs1";
++ reg = <0x600000 0x1600000>;
+ };
+
+ partition at 1c00000 {
+- label = "alt_kernel";
+- reg = <0x1C00000 0x2A0000>;
++ label = "kernel2";
++ reg = <0x1C00000 0x1A00000>;
+ };
+
+- partition at 1ea0000 {
+- label = "alt_rootfs";
+- reg = <0x1EA0000 0x1760000>;
++ partition at 2000000 {
++ label = "rootfs2";
++ reg = <0x2000000 0x1600000>;
+ };
+
+ partition at 3600000 {
diff --git a/target/linux/kirkwood/patches-6.1/106-goflexnet.patch b/target/linux/kirkwood/patches-6.1/106-goflexnet.patch
new file mode 100644
index 0000000000..82cf90841e
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/106-goflexnet.patch
@@ -0,0 +1,53 @@
+--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
++++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
+@@ -8,6 +8,13 @@
+ model = "Seagate GoFlex Net";
+ compatible = "seagate,goflexnet", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_health;
++ led-failsafe = &led_fault;
++ led-running = &led_health;
++ led-upgrade = &led_fault;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x8000000>;
+@@ -85,12 +92,12 @@
+ >;
+ pinctrl-names = "default";
+
+- health {
++ led_health: health {
+ label = "status:green:health";
+ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+- default-state = "keep";
++ default-state = "on";
+ };
+- fault {
++ led_fault: fault {
+ label = "status:orange:fault";
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+@@ -159,18 +166,8 @@
+ };
+
+ partition at 100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
+- };
+-
+- partition at 500000 {
+- label = "pogoplug";
+- reg = <0x0500000 0x2000000>;
+- };
+-
+- partition at 2500000 {
+- label = "root";
+- reg = <0x02500000 0xd800000>;
++ label = "ubi";
++ reg = <0x0100000 0x0ff00000>;
+ };
+ };
+
diff --git a/target/linux/kirkwood/patches-6.1/107-01-zyxel-nsa3x0-common-nand-partitions.patch b/target/linux/kirkwood/patches-6.1/107-01-zyxel-nsa3x0-common-nand-partitions.patch
new file mode 100644
index 0000000000..df654033fd
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/107-01-zyxel-nsa3x0-common-nand-partitions.patch
@@ -0,0 +1,48 @@
+--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
++++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+@@ -112,40 +112,16 @@
+
+ partition at 0 {
+ label = "uboot";
+- reg = <0x0000000 0x0100000>;
++ reg = <0x0000000 0x00c0000>;
+ read-only;
+ };
+ partition at 100000 {
+ label = "uboot_env";
+- reg = <0x0100000 0x0080000>;
++ reg = <0x00c0000 0x0080000>;
+ };
+- partition at 180000 {
+- label = "key_store";
+- reg = <0x0180000 0x0080000>;
+- };
+- partition at 200000 {
+- label = "info";
+- reg = <0x0200000 0x0080000>;
+- };
+- partition at 280000 {
+- label = "etc";
+- reg = <0x0280000 0x0a00000>;
+- };
+- partition at c80000 {
+- label = "kernel_1";
+- reg = <0x0c80000 0x0a00000>;
+- };
+- partition at 1680000 {
+- label = "rootfs1";
+- reg = <0x1680000 0x2fc0000>;
+- };
+- partition at 4640000 {
+- label = "kernel_2";
+- reg = <0x4640000 0x0a00000>;
+- };
+- partition at 5040000 {
+- label = "rootfs2";
+- reg = <0x5040000 0x2fc0000>;
++ partition at 140000 {
++ label = "ubi";
++ reg = <0x0140000 0x7ec0000>;
+ };
+ };
+
diff --git a/target/linux/kirkwood/patches-6.1/107-03-nsa325.patch b/target/linux/kirkwood/patches-6.1/107-03-nsa325.patch
new file mode 100644
index 0000000000..374c0895a9
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/107-03-nsa325.patch
@@ -0,0 +1,54 @@
+--- a/arch/arm/boot/dts/kirkwood-nsa325.dts
++++ b/arch/arm/boot/dts/kirkwood-nsa325.dts
+@@ -15,6 +15,13 @@
+ model = "ZyXEL NSA325";
+ compatible = "zyxel,nsa325", "marvell,kirkwood-88f6282", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_green_sys;
++ led-failsafe = &led_orange_sys;
++ led-running = &led_green_sys;
++ led-upgrade = &led_orange_sys;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>;
+@@ -162,17 +169,19 @@
+ &pmx_led_hdd1_green &pmx_led_hdd1_red>;
+ pinctrl-names = "default";
+
+- green-sys {
++ led_green_sys: green-sys {
+ label = "nsa325:green:sys";
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
++ default-state = "on";
+ };
+- orange-sys {
++ led_orange_sys: orange-sys {
+ label = "nsa325:orange:sys";
+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ };
+ green-hdd1 {
+ label = "nsa325:green:hdd1";
+ gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "ata1";
+ };
+ red-hdd1 {
+ label = "nsa325:red:hdd1";
+@@ -181,6 +190,7 @@
+ green-hdd2 {
+ label = "nsa325:green:hdd2";
+ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "ata2";
+ };
+ red-hdd2 {
+ label = "nsa325:red:hdd2";
+@@ -189,6 +199,7 @@
+ green-usb {
+ label = "nsa325:green:usb";
+ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "usb-host";
+ };
+ green-copy {
+ label = "nsa325:green:copy";
diff --git a/target/linux/kirkwood/patches-6.1/109-pogoplug_v4.patch b/target/linux/kirkwood/patches-6.1/109-pogoplug_v4.patch
new file mode 100644
index 0000000000..4273eb9af1
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/109-pogoplug_v4.patch
@@ -0,0 +1,87 @@
+--- a/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
++++ b/arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
+@@ -18,12 +18,20 @@
+ compatible = "cloudengines,pogoplugv4", "marvell,kirkwood-88f6192",
+ "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_health;
++ led-failsafe = &led_fault;
++ led-running = &led_health;
++ led-upgrade = &led_fault;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x08000000>;
+ };
+
+ chosen {
++ bootargs = "console=ttyS0,115200";
+ stdout-path = "uart0:115200n8";
+ };
+
+@@ -37,8 +45,8 @@
+ eject {
+ debounce-interval = <50>;
+ wakeup-source;
+- linux,code = <KEY_EJECTCD>;
+- label = "Eject Button";
++ linux,code = <KEY_RESTART>;
++ label = "Reset";
+ gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
+ };
+ };
+@@ -48,12 +56,12 @@
+ pinctrl-0 = <&pmx_led_green &pmx_led_red>;
+ pinctrl-names = "default";
+
+- health {
++ led_health: health {
+ label = "pogoplugv4:green:health";
+ gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
+ default-state = "on";
+ };
+- fault {
++ led_fault: fault {
+ label = "pogoplugv4:red:fault";
+ gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
+ };
+@@ -137,29 +145,19 @@
+ #size-cells = <1>;
+
+ partition at 0 {
+- label = "u-boot";
+- reg = <0x00000000 0x200000>;
++ label = "uboot";
++ reg = <0x00000000 0x1c0000>;
+ read-only;
+ };
+
+- partition at 200000 {
+- label = "uImage";
+- reg = <0x00200000 0x300000>;
+- };
+-
+- partition at 500000 {
+- label = "uImage2";
+- reg = <0x00500000 0x300000>;
+- };
+-
+- partition at 800000 {
+- label = "failsafe";
+- reg = <0x00800000 0x800000>;
++ partition at 1c0000 {
++ label = "uboot_env";
++ reg = <0x001c0000 0x40000>;
+ };
+
+- partition at 1000000 {
+- label = "root";
+- reg = <0x01000000 0x7000000>;
++ partition at 200000 {
++ label = "ubi";
++ reg = <0x00200000 0x7e00000>;
+ };
+ };
+ };
diff --git a/target/linux/kirkwood/patches-6.1/110-pogo_e02.patch b/target/linux/kirkwood/patches-6.1/110-pogo_e02.patch
new file mode 100644
index 0000000000..fc384d3521
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/110-pogo_e02.patch
@@ -0,0 +1,68 @@
+--- a/arch/arm/boot/dts/kirkwood-pogo_e02.dts
++++ b/arch/arm/boot/dts/kirkwood-pogo_e02.dts
+@@ -20,6 +20,13 @@
+ compatible = "cloudengines,pogoe02", "marvell,kirkwood-88f6281",
+ "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_health;
++ led-failsafe = &led_fault;
++ led-running = &led_health;
++ led-upgrade = &led_fault;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+@@ -33,12 +40,12 @@
+ gpio-leds {
+ compatible = "gpio-leds";
+
+- health {
++ led_health: health {
+ label = "pogo_e02:green:health";
+ gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
+- default-state = "keep";
++ default-state = "on";
+ };
+- fault {
++ led_fault: fault {
+ label = "pogo_e02:orange:fault";
+ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+ };
+@@ -95,24 +102,24 @@
+ status = "okay";
+
+ partition at 0 {
+- label = "u-boot";
+- reg = <0x0000000 0x100000>;
++ label = "uboot";
++ reg = <0x0 0xe0000>;
+ read-only;
+ };
+
+- partition at 100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
++ partition at e0000 {
++ label = "uboot_env";
++ reg = <0xe0000 0x20000>;
+ };
+
+- partition at 500000 {
+- label = "pogoplug";
+- reg = <0x0500000 0x2000000>;
++ partition at 100000 {
++ label = "second_stage_uboot";
++ reg = <0x100000 0x100000>;
+ };
+
+- partition at 2500000 {
+- label = "root";
+- reg = <0x02500000 0x5b00000>;
++ partition at 200000 {
++ label = "ubi";
++ reg = <0x200000 0x7e00000>;
+ };
+ };
+
diff --git a/target/linux/kirkwood/patches-6.1/111-l-50.patch b/target/linux/kirkwood/patches-6.1/111-l-50.patch
new file mode 100644
index 0000000000..bc933cb610
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/111-l-50.patch
@@ -0,0 +1,47 @@
+--- a/arch/arm/boot/dts/kirkwood-l-50.dts
++++ b/arch/arm/boot/dts/kirkwood-l-50.dts
+@@ -18,6 +18,13 @@
+ reg = <0x00000000 0x20000000>;
+ };
+
++ aliases {
++ led-boot = &led_status_green;
++ led-failsafe = &led_status_red;
++ led-running = &led_status_green;
++ led-upgrade = &led_status_red;
++ };
++
+ chosen {
+ bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
+@@ -95,12 +102,12 @@
+ leds {
+ compatible = "gpio-leds";
+
+- status_green {
++ led_status_green: status_green {
+ label = "l-50:green:status";
+ gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+ };
+
+- status_red {
++ led_status_red: status_red {
+ label = "l-50:red:status";
+ gpios = <&gpio3 2 GPIO_ACTIVE_LOW>;
+ };
+@@ -349,13 +356,8 @@
+ };
+
+ partition at 100000 {
+- label = "kernel-1";
+- reg = <0x00100000 0x00800000>;
+- };
+-
+- partition at 900000 {
+- label = "rootfs-1";
+- reg = <0x00900000 0x07100000>;
++ label = "ubi";
++ reg = <0x00100000 0x07900000>;
+ };
+
+ partition at 7a00000 {
diff --git a/target/linux/kirkwood/patches-6.1/112-sheevaplug.patch b/target/linux/kirkwood/patches-6.1/112-sheevaplug.patch
new file mode 100644
index 0000000000..d1ff9884a0
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/112-sheevaplug.patch
@@ -0,0 +1,47 @@
+--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
++++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+@@ -78,13 +78,8 @@
+ };
+
+ partition at 100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
+- };
+-
+- partition at 500000 {
+- label = "root";
+- reg = <0x0500000 0x1fb00000>;
++ label = "ubi";
++ reg = <0x0100000 0x1ff00000>;
+ };
+ };
+
+--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
++++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+@@ -13,6 +13,13 @@
+ model = "Globalscale Technologies SheevaPlug";
+ compatible = "globalscale,sheevaplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_health;
++ led-failsafe = &led_health;
++ led-running = &led_health;
++ led-upgrade = &led_health;
++ };
++
+ ocp at f1000000 {
+ mvsdio at 90000 {
+ pinctrl-0 = <&pmx_sdio>;
+@@ -28,10 +35,10 @@
+ pinctrl-0 = <&pmx_led_blue &pmx_led_red>;
+ pinctrl-names = "default";
+
+- health {
++ led_health: health {
+ label = "sheevaplug:blue:health";
+ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+- default-state = "keep";
++ default-state = "on";
+ };
+
+ misc {
diff --git a/target/linux/kirkwood/patches-6.1/113-readynas_duo_v2.patch b/target/linux/kirkwood/patches-6.1/113-readynas_duo_v2.patch
new file mode 100644
index 0000000000..c6452c55a3
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/113-readynas_duo_v2.patch
@@ -0,0 +1,76 @@
+--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
++++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+@@ -19,6 +19,13 @@
+ reg = <0x00000000 0x10000000>;
+ };
+
++ aliases {
++ led-boot = &led_power;
++ led-failsafe = &led_power;
++ led-running = &led_power;
++ led-upgrade = &led_power;
++ };
++
+ chosen {
+ bootargs = "console=ttyS0,115200n8 earlyprintk";
+ stdout-path = &uart0;
+@@ -115,7 +122,7 @@
+ &pmx_led_blue_backup >;
+ pinctrl-names = "default";
+
+- power_led {
++ led_power: power_led {
+ label = "status:blue:power_led";
+ gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
+ default-state = "keep";
+@@ -129,11 +136,13 @@
+ disk1_led {
+ label = "status:blue:disk1_led";
+ gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
++ linux,default-trigger = "ata1";
+ };
+
+ disk2_led {
+ label = "status:blue:disk2_led";
+ gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
++ linux,default-trigger = "ata2";
+ };
+
+ backup_led {
+@@ -150,7 +159,13 @@
+
+ power-button {
+ label = "Power Button";
+- linux,code = <KEY_POWER>;
++ /* Power button and INT pin from PHY are both connected
++ * to this GPIO. Every network restart causes PHY restart
++ * and button is pressed. It's difficult to use it as
++ * KEY_POWER without changes in kernel (or netifd) so
++ * the button is configured as regular one.
++ */
++ linux,code = <BTN_1>;
+ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+ };
+
+@@ -208,18 +223,13 @@
+ };
+
+ partition at 200000 {
+- label = "uImage";
++ label = "kernel";
+ reg = <0x0200000 0x600000>;
+ };
+
+ partition at 800000 {
+- label = "minirootfs";
+- reg = <0x0800000 0x1000000>;
+- };
+-
+- partition at 1800000 {
+- label = "jffs2";
+- reg = <0x1800000 0x6800000>;
++ label = "ubi";
++ reg = <0x0800000 0x7800000>;
+ };
+ };
+
diff --git a/target/linux/kirkwood/patches-6.1/114-ctera-c-200-v1.patch b/target/linux/kirkwood/patches-6.1/114-ctera-c-200-v1.patch
new file mode 100644
index 0000000000..eb62e1a5ed
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/114-ctera-c-200-v1.patch
@@ -0,0 +1,58 @@
+--- a/arch/arm/boot/dts/kirkwood-c200-v1.dts
++++ b/arch/arm/boot/dts/kirkwood-c200-v1.dts
+@@ -14,6 +14,14 @@
+ model = "Ctera C200 V1";
+ compatible = "ctera,c200-v1", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
++
++ aliases {
++ led-boot = &led_status_green;
++ led-failsafe = &led_status_red;
++ led-running = &led_status_green;
++ led-upgrade = &led_status_red;
++ };
++
+ chosen {
+ bootargs = "console=ttyS0,115200";
+ stdout-path = &uart0;
+@@ -78,6 +86,7 @@
+ function-enumerator = <1>;
+ color = <LED_COLOR_ID_GREEN>;
+ gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
++ linux,default-trigger = "ata1";
+ };
+
+ led-2 {
+@@ -85,6 +94,7 @@
+ function-enumerator = <2>;
+ color = <LED_COLOR_ID_GREEN>;
+ gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
++ linux,default-trigger = "ata2";
+ };
+
+ led-3 {
+@@ -94,13 +104,13 @@
+ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+ };
+
+- led-4 {
++ led_status_red: led-4 {
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_RED>;
+ gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+ };
+
+- led-5 {
++ led_status_green: led-5 {
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_GREEN>;
+ gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
+@@ -240,7 +250,7 @@
+ };
+
+ partition at 7a00000 {
+- label = "rootfs";
++ label = "ubi";
+ reg = <0x7a00000 0x8600000>;
+ };
+ };
diff --git a/target/linux/kirkwood/patches-6.1/115-nsa310s.patch b/target/linux/kirkwood/patches-6.1/115-nsa310s.patch
new file mode 100644
index 0000000000..4c6e08f49c
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/115-nsa310s.patch
@@ -0,0 +1,35 @@
+--- a/arch/arm/boot/dts/kirkwood-nsa310s.dts
++++ b/arch/arm/boot/dts/kirkwood-nsa310s.dts
+@@ -16,6 +16,13 @@
+ model = "ZyXEL NSA310S";
+ compatible = "zyxel,nsa310s", "marvell,kirkwood-88f6702", "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_green_sys;
++ led-failsafe = &led_red_sys;
++ led-running = &led_green_sys;
++ led-upgrade = &led_red_sys;
++ };
++
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+@@ -96,14 +103,16 @@
+ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
+ };
+
+- led-6 {
++ led_green_sys: led-6 {
++ label = "nsa310s:green:sys";
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_GREEN>;
+ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ };
+
+- led-7 {
++ led_red_sys: led-7 {
++ label = "nsa310s:red:sys";
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_RED>;
+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/kirkwood/patches-6.1/116-4i-edge-200.patch b/target/linux/kirkwood/patches-6.1/116-4i-edge-200.patch
new file mode 100644
index 0000000000..ffc46c29dc
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/116-4i-edge-200.patch
@@ -0,0 +1,34 @@
+--- a/arch/arm/boot/dts/kirkwood-4i-edge-200.dts
++++ b/arch/arm/boot/dts/kirkwood-4i-edge-200.dts
+@@ -20,6 +20,13 @@
+ reg = <0x00000000 0x20000000>;
+ };
+
++ aliases {
++ led-boot = &led_status_green;
++ led-failsafe = &led_status_orange;
++ led-running = &led_status_green;
++ led-upgrade = &led_status_orange;
++ };
++
+ chosen {
+ bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
+@@ -37,13 +44,15 @@
+ linux,default-trigger = "mmc0";
+ };
+
+- led-2 {
++ led_status_orange: led-2 {
++ label = "orange:status";
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_AMBER>;
+ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
+ };
+
+- led-3 {
++ led_status_green: led-3 {
++ label = "green:status";
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_GREEN>;
+ gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/kirkwood/patches-6.1/117-netgear_stora.patch b/target/linux/kirkwood/patches-6.1/117-netgear_stora.patch
new file mode 100644
index 0000000000..c7518933b2
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/117-netgear_stora.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -375,6 +375,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
+ kirkwood-rs411.dtb \
+ kirkwood-sheevaplug.dtb \
+ kirkwood-sheevaplug-esata.dtb \
++ kirkwood-stora.dtb \
+ kirkwood-t5325.dtb \
+ kirkwood-topkick.dtb \
+ kirkwood-ts219-6281.dtb \
diff --git a/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch b/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch
new file mode 100644
index 0000000000..3db362de9f
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/201-enable-sata-port-specific-led-triggers.patch
@@ -0,0 +1,10 @@
+--- a/arch/arm/mach-mvebu/Kconfig
++++ b/arch/arm/mach-mvebu/Kconfig
+@@ -115,6 +115,7 @@ config MACH_DOVE
+ config MACH_KIRKWOOD
+ bool "Marvell Kirkwood boards"
+ depends on ARCH_MULTI_V5
++ select ARCH_WANT_LIBATA_LEDS
+ select CPU_FEROCEON
+ select GPIOLIB
+ select KIRKWOOD_CLK
diff --git a/target/linux/kirkwood/patches-6.1/202-linksys-find-active-root.patch b/target/linux/kirkwood/patches-6.1/202-linksys-find-active-root.patch
new file mode 100644
index 0000000000..5029b1791c
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/202-linksys-find-active-root.patch
@@ -0,0 +1,62 @@
+The WRT1900AC among other Linksys routers uses a dual-firmware layout.
+Dynamically rename the active partition to "ubi".
+
+Signed-off-by: Imre Kaloz <kaloz at openwrt.org>
+---
+--- a/drivers/mtd/parsers/ofpart_core.c
++++ b/drivers/mtd/parsers/ofpart_core.c
+@@ -38,6 +38,8 @@ static bool node_has_compatible(struct d
+ return of_get_property(pp, "compatible", NULL);
+ }
+
++static int mangled_rootblock;
++
+ static int parse_fixed_partitions(struct mtd_info *master,
+ const struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+@@ -47,6 +49,7 @@ static int parse_fixed_partitions(struct
+ struct mtd_partition *parts;
+ struct device_node *mtd_node;
+ struct device_node *ofpart_node;
++ const char *owrtpart = "ubi";
+ const char *partname;
+ struct device_node *pp;
+ int nr_parts, i, ret = 0;
+@@ -152,9 +155,15 @@ static int parse_fixed_partitions(struct
+ parts[i].size = of_read_number(reg + a_cells, s_cells);
+ parts[i].of_node = pp;
+
+- partname = of_get_property(pp, "label", &len);
+- if (!partname)
+- partname = of_get_property(pp, "name", &len);
++ if (mangled_rootblock && (i == mangled_rootblock)) {
++ partname = owrtpart;
++ } else {
++ partname = of_get_property(pp, "label", &len);
++
++ if (!partname)
++ partname = of_get_property(pp, "name", &len);
++ }
++
+ parts[i].name = partname;
+
+ if (of_get_property(pp, "read-only", &len))
+@@ -271,6 +280,18 @@ static int __init ofpart_parser_init(voi
+ return 0;
+ }
+
++static int __init active_root(char *str)
++{
++ get_option(&str, &mangled_rootblock);
++
++ if (!mangled_rootblock)
++ return 1;
++
++ return 1;
++}
++
++__setup("mangled_rootblock=", active_root);
++
+ static void __exit ofpart_parser_exit(void)
+ {
+ deregister_mtd_parser(&ofpart_parser);
diff --git a/target/linux/kirkwood/patches-6.1/203-blackarmor-nas220.patch b/target/linux/kirkwood/patches-6.1/203-blackarmor-nas220.patch
new file mode 100644
index 0000000000..e04a28206a
--- /dev/null
+++ b/target/linux/kirkwood/patches-6.1/203-blackarmor-nas220.patch
@@ -0,0 +1,99 @@
+--- a/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
++++ b/arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts
+@@ -17,6 +17,13 @@
+ compatible = "seagate,blackarmor-nas220","marvell,kirkwood-88f6192",
+ "marvell,kirkwood";
+
++ aliases {
++ led-boot = &led_status_amber;
++ led-failsafe = &led_status_amber;
++ led-running = &led_status_blue;
++ led-upgrade = &led_status_amber;
++ };
++
+ memory { /* 128 MB */
+ device_type = "memory";
+ reg = <0x00000000 0x8000000>;
+@@ -36,14 +43,14 @@
+ compatible = "gpio-keys";
+
+ reset {
+- label = "Reset";
+- linux,code = <KEY_POWER>;
++ label = "Reset Button";
++ linux,code = <KEY_RESTART>;
+ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ };
+
+- button {
+- label = "Power";
+- linux,code = <KEY_SLEEP>;
++ power {
++ label = "Power Button";
++ linux,code = <KEY_POWER>;
+ gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
+ };
+ };
+@@ -51,11 +58,27 @@
+ gpio-leds {
+ compatible = "gpio-leds";
+
+- blue-power {
++ led_power_blue: power_blue {
+ label = "nas220:blue:power";
+ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "default-on";
+ };
++
++ disk_blue {
++ label = "nas220:blue:disk";
++ gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
++ linux,default-trigger = "disk-activity";
++ };
++
++ led_status_blue: status_blue {
++ label = "nas220:blue:status";
++ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
++ };
++
++ led_status_amber: status_amber {
++ label = "nas220:amber:status";
++ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
++ };
+ };
+
+ regulators {
+@@ -153,6 +176,33 @@
+
+ &nand {
+ status = "okay";
++
++ partitions {
++ compatible = "fixed-partitions";
++
++ partition at 0 {
++ label = "uboot";
++ reg = <0x0 0xa0000>;
++ read-only;
++ };
++
++ partition at a0000 {
++ label = "uboot-env";
++ reg = <0xa0000 0x10000>;
++ read-only;
++ };
++
++ partition at b0000 {
++ label = "reserved";
++ reg = <0xb0000 0x10000>;
++ read-only;
++ };
++
++ partition at c0000 {
++ label = "ubi";
++ reg = <0xc0000 0x1e80000>;
++ };
++ };
+ };
+
+ &mdio {
More information about the lede-commits
mailing list