From: Pawel Dembicki Date: Thu, 11 May 2023 15:02:43 +0000 (+0200) Subject: kirkwood: Replace dtses with upstream accepted X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=749237967a12;p=openwrt%2Fstaging%2Fblocktrron.git kirkwood: Replace dtses with upstream accepted DTSes from of three boards was sent and accpeted upstream. Let's use backport patches with small OpenWrt tweak like other upstream stuff. List of boards: - Zyxel NSA310S - Endian 4i Edge 200 - Ctera C-200 V1 Signed-off-by: Pawel Dembicki --- diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts deleted file mode 100644 index 8e6c198c5e..0000000000 --- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts +++ /dev/null @@ -1,218 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Endian 4i Edge 200 Board Description - * Note: Endian UTM Mini is hardware clone of Endian Edge 200 - * Copyright 2021 Pawel Dembicki - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - model = "Endian 4i Edge 200"; - compatible = "endian,4i-edge-200", "marvell,kirkwood-88f6281", "marvell,kirkwood"; - - memory { - device_type = "memory"; - 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; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_led49 &pmx_led35 &pmx_led34>; - pinctrl-names = "default"; - - led_status_green: status_green { - label = "green:status"; - gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; - }; - - led_status_orange: status_orange { - label = "orange:status"; - gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; - }; - - sdcard { - label = "orange:sdcard"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "mmc0"; - }; - }; -}; - -ð0 { - status = "okay"; -}; - -ð0port { - speed = <1000>; - duplex = <1>; -}; - -ð1 { - status = "okay"; -}; - -ð1port { - phy-handle = <ðphyb>; -}; - -&mdio { - status = "okay"; - - ethphyb: ethernet-phy@b { - reg = <0x0b>; - - marvell,reg-init = - /* link-activity, bi-color mode 4 */ - <3 0x10 0xfff0 0xf>; /* Reg 3,16 <- 0xzzzf */ - }; - - switch0: switch@11 { - compatible = "marvell,mv88e6085"; - reg = <0x11>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - label = "port1"; - }; - - port@1 { - reg = <1>; - label = "port2"; - }; - - port@2 { - reg = <2>; - label = "port3"; - }; - - port@3 { - reg = <3>; - label = "port4"; - }; - - port@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@0 { - label = "u-boot"; - reg = <0x00000000 0x000a0000>; - read-only; - }; - - partition@a0000 { - label = "u-boot-env"; - reg = <0x000a0000 0x00060000>; - read-only; - }; - - partition@100000 { - label = "kernel"; - reg = <0x00100000 0x00400000>; - }; - - partition@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_led34: pmx_led34 { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - - pmx_led35: pmx_led35 { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - - pmx_led49: pmx_led49 { - marvell,pins = "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/files/arch/arm/boot/dts/kirkwood-c200-v1.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-c200-v1.dts deleted file mode 100644 index 9ff73382b3..0000000000 --- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-c200-v1.dts +++ /dev/null @@ -1,303 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * Ctera C200 V1 Board Description - * Copyright 2021 Pawel Dembicki - */ - -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - 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; - }; - - memory@0 { - device_type = "memory"; - reg = <0x00000000 0x20000000>; - }; - - keys { - compatible = "gpio-keys"; - pinctrl-0 = <&pmx_buttons>; - pinctrl-names = "default"; - - power { - label = "Power Button"; - linux,code = ; - gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; - }; - - reset { - label = "Reset Button"; - linux,code = ; - gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; - }; - - usb1 { - label = "USB1 Button"; - linux,code = ; - gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; - }; - - usb2 { - label = "USB2 Button"; - linux,code = ; - gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; - }; - }; - - gpio-poweroff { - compatible = "gpio-poweroff"; - pinctrl-0 = <&pmx_poweroff>; - pinctrl-names = "default"; - gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-0 = <&pmx_leds>; - pinctrl-names = "default"; - - led_status_green: status-green { - label = "green:status"; - gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; - }; - - led_status_red: status-red { - label = "red:status"; - gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; - }; - - cloud-blue { - label = "blue:cloud"; - gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; - }; - - disk1-green { - label = "green:disk1"; - gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; - linux,default-trigger = "ata1"; - }; - - disk1-red { - label = "red:disk1"; - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; - }; - - disk2-green { - label = "green:disk2"; - gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; - linux,default-trigger = "ata2"; - }; - - disk2-red { - label = "red:disk2"; - gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; - }; - - disk-fail-green { - label = "green:disk-fail"; - gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; - }; - - disk-fail-red { - label = "red:disk-fail"; - gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; - }; - - usb1-green { - label = "green:usb1"; - gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "usbport"; - trigger-sources = <&hub_port2>; - }; - - usb1-red { - label = "red:usb1"; - gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; - }; - - usb2-green { - label = "green:usb2"; - gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; - linux,default-trigger = "usbport"; - trigger-sources = <&hub_port1>; - }; - - usb2-red { - label = "red:usb2"; - gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; - }; - }; -}; - -ð0 { - status = "okay"; -}; - -ð0port { - phy-handle = <ðphy9>; -}; - -&i2c0 { - status = "okay"; - - rtc@30 { - compatible = "s35390a"; - reg = <0x30>; - }; - - lm63@4c { - compatible = "national,lm63"; - reg = <0x4c>; - }; -}; - -&mdio { - status = "okay"; - - ethphy9: ethernet-phy@9 { - reg = <9>; - }; -}; - -&nand { - status = "okay"; - chip-delay = <40>; - - partition@0 { - label = "uboot"; - reg = <0x0000000 0x200000>; - }; - - partition@200000 { - label = "certificate"; - reg = <0x0200000 0x100000>; - }; - - partition@300000 { - label = "preset_cfg"; - reg = <0x0300000 0x100000>; - }; - - partition@400000 { - label = "dev_params"; - reg = <0x0400000 0x100000>; - }; - partition@500000 { - label = "active_bank"; - reg = <0x0500000 0x0100000>; - }; - - partition@600000 { - label = "magic"; - reg = <0x0600000 0x0100000>; - }; - - partition@700000 { - label = "bank1"; - reg = <0x0700000 0x2800000>; - }; - - partition@2f00000 { - label = "bank2"; - reg = <0x2f00000 0x2800000>; - }; - - /* 0x5700000-0x5a00000 undefined in vendor firmware */ - - partition@5a00000 { - label = "reserved"; - reg = <0x5a00000 0x2000000>; - }; - - partition@7a00000 { - label = "ubi"; - reg = <0x7a00000 0x8600000>; - }; -}; - -&pciec { - status = "okay"; -}; - -&pcie0 { - status = "okay"; -}; - -&pinctrl { - /* buzzer gpios are connected to two pins of buzzer - * leave it as is due lack of proper driver - */ - pmx_buzzer: pmx-buzzer { - marvell,pins = "mpp12", "mpp13"; - marvell,function = "gpio"; - }; - - pmx_leds: pmx-leds { - marvell,pins = "mpp14", "mpp15", "mpp16", "mpp17", "mpp38", - "mpp39", "mpp40", "mpp42", "mpp43", "mpp44", - "mpp45", "mpp46", "mpp47"; - marvell,function = "gpio"; - }; - - pmx_buttons: pmx-buttons { - marvell,pins = "mpp28", "mpp29", "mpp48", "mpp49"; - marvell,function = "gpio"; - }; - - pmx_poweroff: pmx-poweroff { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; -}; - -&rtc { - status = "disabled"; -}; - -&sata { - status = "okay"; - nr-ports = <2>; -}; - -&uart0 { - status = "okay"; -}; - -&usb0 { - #address-cells = <1>; - #size-cells = <0>; - status = "okay"; - - port@1 { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - #trigger-source-cells = <0>; - - hub_port1: port@1 { - reg = <1>; - #trigger-source-cells = <0>; - }; - - hub_port2: port@2 { - reg = <2>; - #trigger-source-cells = <0>; - }; - }; -}; diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts deleted file mode 100644 index a72276ed72..0000000000 --- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-nsa310s.dts +++ /dev/null @@ -1,271 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/dts-v1/; - -#include "kirkwood.dtsi" -#include "kirkwood-6281.dtsi" - -/ { - 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>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - stdout-path = &uart0; - }; - - ocp@f1000000 { - pinctrl: pin-controller@10000 { - pinctrl-names = "default"; - - pmx_usb_power: pmx-usb-power { - marvell,pins = "mpp21"; - marvell,function = "gpio"; - }; - - pmx_pwr_off: pmx-pwr-off { - marvell,pins = "mpp27"; - marvell,function = "gpio"; - }; - - pmx_btn_reset: pmx-btn-reset { - marvell,pins = "mpp24"; - marvell,function = "gpio"; - }; - - pmx_btn_copy: pmx-btn-copy { - marvell,pins = "mpp25"; - marvell,function = "gpio"; - }; - - pmx_btn_power: pmx-btn-power { - marvell,pins = "mpp26"; - marvell,function = "gpio"; - }; - - pmx_led_usb_green: pmx-led-usb-green { - marvell,pins = "mpp15"; - marvell,function = "gpio"; - }; - - pmx_led_copy_green: pmx-led-copy-green { - marvell,pins = "mpp22"; - marvell,function = "gpio"; - }; - - pmx_led_copy_red: pmx-led-copy-red { - marvell,pins = "mpp23"; - marvell,function = "gpio"; - }; - - pmx_led_sys_green: pmx-led-sys-green { - marvell,pins = "mpp28"; - marvell,function = "gpio"; - }; - - pmx_led_sys_red: pmx-led-sys-red { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - - pmx_led_hdd1_green: pmx-led-hdd1-green { - marvell,pins = "mpp16"; - marvell,function = "gpio"; - }; - - pmx_led_hdd1_red: pmx-led-hdd1-red { - marvell,pins = "mpp13"; - marvell,function = "gpio"; - }; - - pmx_pwr_sata1: pmx-pwr-sata1 { - marvell,pins = "mpp33"; - marvell,function = "gpio"; - }; - - }; - - i2c@11000 { - status = "okay"; - - rtc@68 { - compatible = "htk,ht1382"; - reg = <0x68>; - }; - }; - - serial@12000 { - status = "okay"; - }; - }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_usb_power &pmx_pwr_sata1>; - pinctrl-names = "default"; - - usb0_power: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - 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@2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "SATA1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>; - }; - }; - - keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>; - pinctrl-names = "default"; - - power { - label = "Power Button"; - linux,code = ; - gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; - }; - - copy { - label = "Copy Button"; - linux,code = ; - gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; - }; - - reset { - label = "Reset Button"; - linux,code = ; - gpios = <&gpio0 24 GPIO_ACTIVE_LOW>; - }; - }; - - leds { - compatible = "gpio-leds"; - - led_green_sys: green-sys { - label = "nsa310s:green:sys"; - gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "default-on"; - }; - - led_red_sys: red-sys { - label = "nsa310s:red:sys"; - gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; - }; - - green-hdd1 { - label = "nsa310s:green:hdd1"; - gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "ata1"; - }; - - red-hdd1 { - label = "nsa310s:red:hdd1"; - gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; - }; - - green-usb { - label = "nsa310s:green:usb"; - gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "usb-host"; - }; - - green-copy { - label = "nsa310s:green:copy"; - gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; - }; - - red-copy { - label = "nsa310s:red:copy"; - gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; - }; - }; - - gpio_poweroff { - compatible = "gpio-poweroff"; - pinctrl-0 = <&pmx_pwr_off>; - pinctrl-names = "default"; - gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>; - }; -}; - - -ð0 { - status = "okay"; - - ethernet0-port@0 { - phy-handle = <ðphy0>; - }; -}; - -&mdio { - status = "okay"; - - ethphy0: ethernet-phy@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@0 { - label = "uboot"; - reg = <0x0000000 0x00c0000>; - read-only; - }; - partition@c0000 { - label = "uboot_env"; - reg = <0x00c0000 0x0080000>; - }; - partition@140000 { - label = "ubi"; - reg = <0x0140000 0x7ec0000>; - }; -}; - -&pciec { - status = "okay"; -}; - -&pcie0 { - status = "okay"; -}; - -&sata { - status = "okay"; - nr-ports = <1>; -}; diff --git a/target/linux/kirkwood/patches-5.15/001-5.18-Add-Ctera-C-200-V1-board.patch b/target/linux/kirkwood/patches-5.15/001-5.18-Add-Ctera-C-200-V1-board.patch new file mode 100644 index 0000000000..453915e8cf --- /dev/null +++ b/target/linux/kirkwood/patches-5.15/001-5.18-Add-Ctera-C-200-V1-board.patch @@ -0,0 +1,350 @@ +From 5fc74dbdf8f640a7ca7fb92345ac6fbeaa078d65 Mon Sep 17 00:00:00 2001 +From: Pawel Dembicki +Date: Tue, 15 Feb 2022 17:39:22 +0100 +Subject: [PATCH] ARM: dts: kirkwood: Add Ctera C-200 V1 board + +Ctera C200 V1 is kirkwood-based 2-Bay NAS. + +Hardware: + - SoC: Marvell 88F6281-A1 ARMv5TE Processor 1.2GHz + - Ram: 512MB (4x Nanya NT5TU128M8GE-AC) + - NAND Flash: 256MB (Samsung 216 K9F2G08U0C) + - Lan: 1x GBE (Marvell 88E1116R-NNC1) + - Storage: 2x SATA HDD 3.5" Slot + - USB: 2x USB 2.0 port + - Console: Internal J3 connector (1: Vcc, 2: Rx, 3: Tx, 4: GND) + - LEDs: 13x GPIO controlled + - Buttons: 2x GPIO controlled + +Signed-off-by: Pawel Dembicki +Reviewed-by: Andrew Lunn +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/kirkwood-c200-v1.dts | 310 +++++++++++++++++++++++++ + 2 files changed, 311 insertions(+) + create mode 100644 arch/arm/boot/dts/kirkwood-c200-v1.dts + +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile +@@ -267,6 +267,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += \ + dtb-$(CONFIG_MACH_KIRKWOOD) += \ + kirkwood-b3.dtb \ + kirkwood-blackarmor-nas220.dtb \ ++ kirkwood-c200-v1.dtb \ + kirkwood-cloudbox.dtb \ + kirkwood-d2net.dtb \ + kirkwood-db-88f6281.dtb \ +--- /dev/null ++++ b/arch/arm/boot/dts/kirkwood-c200-v1.dts +@@ -0,0 +1,310 @@ ++// SPDX-License-Identifier: GPL-2.0-or-later ++/* ++ * Ctera C200 V1 Board Description ++ * Copyright 2021-2022 Pawel Dembicki ++ */ ++ ++/dts-v1/; ++ ++#include "kirkwood.dtsi" ++#include "kirkwood-6281.dtsi" ++#include ++ ++/ { ++ model = "Ctera C200 V1"; ++ compatible = "ctera,c200-v1", "marvell,kirkwood-88f6281", "marvell,kirkwood"; ++ ++ chosen { ++ bootargs = "console=ttyS0,115200"; ++ stdout-path = &uart0; ++ }; ++ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x00000000 0x20000000>; ++ }; ++ ++ keys { ++ compatible = "gpio-keys"; ++ pinctrl-0 = <&pmx_buttons>; ++ pinctrl-names = "default"; ++ ++ power { ++ label = "Power Button"; ++ linux,code = ; ++ gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ reset { ++ label = "Reset Button"; ++ linux,code = ; ++ gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; ++ }; ++ ++ usb1 { ++ label = "USB1 Button"; ++ linux,code = ; ++ gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; ++ }; ++ ++ usb2 { ++ label = "USB2 Button"; ++ linux,code = ; ++ gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; ++ }; ++ }; ++ ++ gpio-poweroff { ++ compatible = "gpio-poweroff"; ++ pinctrl-0 = <&pmx_poweroff>; ++ pinctrl-names = "default"; ++ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ pinctrl-0 = <&pmx_leds>; ++ pinctrl-names = "default"; ++ ++ led-0 { ++ function = LED_FUNCTION_DISK; ++ function-enumerator = <2>; ++ color = ; ++ gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-1 { ++ function = LED_FUNCTION_DISK; ++ function-enumerator = <1>; ++ color = ; ++ gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-2 { ++ function = LED_FUNCTION_DISK; ++ function-enumerator = <2>; ++ color = ; ++ gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-3 { ++ function = LED_FUNCTION_DISK; ++ function-enumerator = <1>; ++ color = ; ++ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-4 { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-5 { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-6 { ++ function = LED_FUNCTION_INDICATOR; ++ color = ; ++ gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-7 { ++ function = LED_FUNCTION_DISK_ERR; ++ color = ; ++ gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-8 { ++ function = LED_FUNCTION_DISK_ERR; ++ color = ; ++ gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-9 { ++ function = LED_FUNCTION_USB; ++ function-enumerator = <1>; ++ color = ; ++ gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-10 { ++ function = LED_FUNCTION_USB; ++ function-enumerator = <1>; ++ color = ; ++ gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "usbport"; ++ trigger-sources = <&hub_port2>; ++ }; ++ ++ led-11 { ++ function = LED_FUNCTION_USB; ++ function-enumerator = <2>; ++ color = ; ++ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; ++ }; ++ ++ led-12 { ++ function = LED_FUNCTION_USB; ++ function-enumerator = <2>; ++ color = ; ++ gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "usbport"; ++ trigger-sources = <&hub_port1>; ++ }; ++ }; ++}; ++ ++ð0 { ++ status = "okay"; ++}; ++ ++ð0port { ++ phy-handle = <ðphy9>; ++}; ++ ++&i2c0 { ++ status = "okay"; ++ ++ rtc@30 { ++ compatible = "s35390a"; ++ reg = <0x30>; ++ }; ++ ++ lm63@4c { ++ compatible = "national,lm63"; ++ reg = <0x4c>; ++ }; ++}; ++ ++&mdio { ++ status = "okay"; ++ ++ ethphy9: ethernet-phy@9 { ++ reg = <9>; ++ }; ++}; ++ ++&nand { ++ status = "okay"; ++ chip-delay = <40>; ++ ++ partition@0 { ++ label = "uboot"; ++ reg = <0x0000000 0x200000>; ++ }; ++ ++ partition@200000 { ++ label = "certificate"; ++ reg = <0x0200000 0x100000>; ++ }; ++ ++ partition@300000 { ++ label = "preset_cfg"; ++ reg = <0x0300000 0x100000>; ++ }; ++ ++ partition@400000 { ++ label = "dev_params"; ++ reg = <0x0400000 0x100000>; ++ }; ++ ++ partition@500000 { ++ label = "active_bank"; ++ reg = <0x0500000 0x0100000>; ++ }; ++ ++ partition@600000 { ++ label = "magic"; ++ reg = <0x0600000 0x0100000>; ++ }; ++ ++ partition@700000 { ++ label = "bank1"; ++ reg = <0x0700000 0x2800000>; ++ }; ++ ++ partition@2f00000 { ++ label = "bank2"; ++ reg = <0x2f00000 0x2800000>; ++ }; ++ ++ /* 0x5700000-0x5a00000 undefined in vendor firmware */ ++ ++ partition@5a00000 { ++ label = "reserved"; ++ reg = <0x5a00000 0x2000000>; ++ }; ++ ++ partition@7a00000 { ++ label = "rootfs"; ++ reg = <0x7a00000 0x8600000>; ++ }; ++}; ++ ++&pinctrl { ++ /* Buzzer gpios are connected to two pins of buzzer. ++ * This buzzer require a modulated signal from gpio. ++ * Leave it as is due lack of proper driver. ++ */ ++ pmx_buzzer: pmx-buzzer { ++ marvell,pins = "mpp12", "mpp13"; ++ marvell,function = "gpio"; ++ }; ++ ++ pmx_leds: pmx-leds { ++ marvell,pins = "mpp14", "mpp15", "mpp16", "mpp17", "mpp38", ++ "mpp39", "mpp40", "mpp42", "mpp43", "mpp44", ++ "mpp45", "mpp46", "mpp47"; ++ marvell,function = "gpio"; ++ }; ++ ++ pmx_buttons: pmx-buttons { ++ marvell,pins = "mpp28", "mpp29", "mpp48", "mpp49"; ++ marvell,function = "gpio"; ++ }; ++ ++ pmx_poweroff: pmx-poweroff { ++ marvell,pins = "mpp34"; ++ marvell,function = "gpio"; ++ }; ++}; ++ ++&rtc { ++ status = "disabled"; ++}; ++ ++&sata { ++ status = "okay"; ++ nr-ports = <2>; ++}; ++ ++&uart0 { ++ status = "okay"; ++}; ++ ++&usb0 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ status = "okay"; ++ ++ port@1 { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ reg = <1>; ++ #trigger-source-cells = <0>; ++ ++ hub_port1: port@1 { ++ reg = <1>; ++ #trigger-source-cells = <0>; ++ }; ++ ++ hub_port2: port@2 { ++ reg = <2>; ++ #trigger-source-cells = <0>; ++ }; ++ }; ++}; diff --git a/target/linux/kirkwood/patches-5.15/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch b/target/linux/kirkwood/patches-5.15/002-6.2-ARM-dts-kirkwood-Add-Zyxel-NSA310S-board.patch new file mode 100644 index 0000000000..b745ea104f --- /dev/null +++ b/target/linux/kirkwood/patches-5.15/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 +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 +Signed-off-by: Pawel Dembicki +Acked-by: Adam Baker +Reviewed-by: Andrew Lunn +Signed-off-by: Gregory CLEMENT +--- + 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 +@@ -320,6 +320,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 ++ * Copyright (c) 2015-2021, Tony Dinh ++ * Copyright (c) 2014, Adam Baker ++ * Based upon the board setup file created by Peter Schildmann ++ */ ++/dts-v1/; ++ ++#include "kirkwood.dtsi" ++#include "kirkwood-6281.dtsi" ++#include ++ ++/ { ++ 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 = ; ++ gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ copy { ++ label = "Copy Button"; ++ linux,code = ; ++ gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; ++ }; ++ ++ reset { ++ label = "Reset Button"; ++ linux,code = ; ++ 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 = ; ++ gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ led-2 { ++ function = LED_FUNCTION_USB; ++ color = ; ++ gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "usb-host"; ++ }; ++ ++ led-3 { ++ function = LED_FUNCTION_DISK; ++ color = ; ++ gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "ata1"; ++ }; ++ ++ led-4 { ++ function = LED_FUNCTION_INDICATOR; ++ color = ; ++ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ led-5 { ++ function = LED_FUNCTION_INDICATOR; ++ color = ; ++ gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ led-6 { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ led-7 { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ usb0_power: regulator@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@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@0 { ++ phy-handle = <ðphy0>; ++ }; ++}; ++ ++&i2c0 { ++ status = "okay"; ++ ++ rtc@68 { ++ compatible = "htk,ht1382"; ++ reg = <0x68>; ++ }; ++}; ++ ++&mdio { ++ status = "okay"; ++ ++ ethphy0: ethernet-phy@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@0 { ++ label = "uboot"; ++ reg = <0x0000000 0x00c0000>; ++ read-only; ++ }; ++ partition@c0000 { ++ label = "uboot_env"; ++ reg = <0x00c0000 0x0080000>; ++ }; ++ partition@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@0 { ++ reg = <0>; ++ #thermal-sensor-cells = <0>; ++ }; ++}; ++ ++&uart0 { ++ status = "okay"; ++}; diff --git a/target/linux/kirkwood/patches-5.15/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch b/target/linux/kirkwood/patches-5.15/003-6.5-ARM-dts-kirkwood-Add-Endian-4i-Edge-200-board.patch new file mode 100644 index 0000000000..4b0f46bb6d --- /dev/null +++ b/target/linux/kirkwood/patches-5.15/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 +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 +Reviewed-by: Andrew Lunn +Signed-off-by: Gregory CLEMENT +--- + 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 +@@ -265,6 +265,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 ++ */ ++ ++/dts-v1/; ++ ++#include "kirkwood.dtsi" ++#include "kirkwood-6281.dtsi" ++#include ++ ++/ { ++ 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 = ; ++ gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc0"; ++ }; ++ ++ led-2 { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; ++ }; ++ ++ led-3 { ++ function = LED_FUNCTION_STATUS; ++ color = ; ++ 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@b { ++ reg = <0x0b>; ++ ++ marvell,reg-init = ++ /* link-activity, bi-color mode 4 */ ++ <3 0x10 0xfff0 0xf>; /* Reg 3,16 <- 0xzzzf */ ++ }; ++ ++ switch0: switch@11 { ++ compatible = "marvell,mv88e6085"; ++ reg = <0x11>; ++ ++ ports { ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ port@0 { ++ reg = <0>; ++ label = "port1"; ++ }; ++ ++ port@1 { ++ reg = <1>; ++ label = "port2"; ++ }; ++ ++ port@2 { ++ reg = <2>; ++ label = "port3"; ++ }; ++ ++ port@3 { ++ reg = <3>; ++ label = "port4"; ++ }; ++ ++ port@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@0 { ++ label = "u-boot"; ++ reg = <0x00000000 0x000a0000>; ++ read-only; ++ }; ++ ++ partition@a0000 { ++ label = "u-boot-env"; ++ reg = <0x000a0000 0x00060000>; ++ read-only; ++ }; ++ ++ partition@100000 { ++ label = "kernel"; ++ reg = <0x00100000 0x00400000>; ++ }; ++ ++ partition@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-5.15/114-ctera-c-200-v1.patch b/target/linux/kirkwood/patches-5.15/114-ctera-c-200-v1.patch new file mode 100644 index 0000000000..23922b8d88 --- /dev/null +++ b/target/linux/kirkwood/patches-5.15/114-ctera-c-200-v1.patch @@ -0,0 +1,51 @@ +--- 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 = ; + gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "ata1"; + }; + + led-2 { +@@ -85,6 +94,7 @@ + function-enumerator = <2>; + color = ; + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; ++ linux,default-trigger = "ata2"; + }; + + led-3 { +@@ -94,13 +104,15 @@ + gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; + }; + +- led-4 { ++ led_status_red: led-4 { ++ label = "red:status"; + function = LED_FUNCTION_STATUS; + color = ; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; + }; + +- led-5 { ++ led_status_green: led-5 { ++ label = "green:status"; + function = LED_FUNCTION_STATUS; + color = ; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; diff --git a/target/linux/kirkwood/patches-5.15/115-nsa310s.patch b/target/linux/kirkwood/patches-5.15/115-nsa310s.patch new file mode 100644 index 0000000000..4c6e08f49c --- /dev/null +++ b/target/linux/kirkwood/patches-5.15/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 = ; + 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 = ; + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; diff --git a/target/linux/kirkwood/patches-5.15/116-4i-edge-200.patch b/target/linux/kirkwood/patches-5.15/116-4i-edge-200.patch new file mode 100644 index 0000000000..ffc46c29dc --- /dev/null +++ b/target/linux/kirkwood/patches-5.15/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 = ; + gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; + }; + +- led-3 { ++ led_status_green: led-3 { ++ label = "green:status"; + function = LED_FUNCTION_STATUS; + color = ; + gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;