Simple copy 5.15 patches.
Upstreamed patch dropped:
001-5.18-Add-Ctera-C-200-V1-board.patch
Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
(kirkwoor -> kirkwood in subject)
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
--- /dev/null
+From e977a103840c57d72b52cbc8c17f87f86ef9aa8d Mon Sep 17 00:00:00 2001
+From: Pawel Dembicki <paweldembicki@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@gmail.com>
+Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
+Acked-by: Adam Baker <linux@baker-net.org.uk>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@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
+@@ -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 <paweldembicki@gmail.com>
++ * Copyright (c) 2015-2021, Tony Dinh <mibodhi@gmail.com>
++ * Copyright (c) 2014, Adam Baker <linux@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@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";
++};
--- /dev/null
+From 5668d088ee4ea05db9daaae0645d1d1f579b20f9 Mon Sep 17 00:00:00 2001
+From: Pawel Dembicki <paweldembicki@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@gmail.com>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement@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
+@@ -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 <paweldembicki@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@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";
++};
--- /dev/null
+--- 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@100000 {
+- label = "uImage";
+- reg = <0x0100000 0x600000>;
++ label = "second stage u-boot";
++ reg = <0x100000 0x200000>;
+ };
+
+- partition@700000 {
+- label = "root";
+- reg = <0x0700000 0xf900000>;
++ partition@200000 {
++ label = "ubi";
++ reg = <0x200000 0xfe00000>;
+ };
+
+ };
--- /dev/null
+--- 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@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@0 {
+- label = "uboot";
+- reg = <0x0000000 0xc0000>;
++ label = "u-boot";
++ reg = <0x0000000 0xe0000>;
+ };
+
+- partition@a0000 {
+- label = "env";
+- reg = <0xa0000 0x20000>;
++ partition@e0000 {
++ label = "u-boot environment";
++ reg = <0xe0000 0x100000>;
+ };
+
+ partition@100000 {
+- label = "zImage";
+- reg = <0x100000 0x300000>;
+- };
+-
+- partition@540000 {
+- label = "initrd";
+- reg = <0x540000 0x300000>;
++ label = "second stage u-boot";
++ reg = <0x100000 0x200000>;
+ };
+
+- partition@980000 {
+- label = "boot";
+- reg = <0x980000 0x1f400000>;
++ partition@200000 {
++ label = "ubi";
++ reg = <0x200000 0x1fe00000>;
+ };
+ };
+
--- /dev/null
+--- 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@0 {
+ label = "u-boot";
+- reg = <0x0000000 0x100000>;
+- read-only;
++ reg = <0x0000000 0xe0000>;
++ };
++
++ partition@e0000 {
++ label = "u-boot environment";
++ reg = <0xe0000 0x100000>;
+ };
+
+ partition@100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
++ label = "second stage u-boot";
++ reg = <0x100000 0x200000>;
+ };
+
+- partition@500000 {
+- label = "data";
+- reg = <0x0500000 0xfb00000>;
++ partition@200000 {
++ label = "ubi";
++ reg = <0x200000 0xfe00000>;
+ };
+ };
+
--- /dev/null
+--- 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,18 +193,18 @@
+ };
+
+ partition@a0000 {
+- label = "env";
++ label = "u-boot environment";
+ reg = <0xa0000 0x20000>;
+ read-only;
+ };
+
+ partition@100000 {
+- label = "uImage";
++ label = "kernel";
+ reg = <0x100000 0x300000>;
+ };
+
+ partition@400000 {
+- label = "rootfs";
++ label = "ubi";
+ reg = <0x400000 0x1C00000>;
+ };
+ };
+@@ -211,7 +218,7 @@
+ };
+
+ ð0 {
+- status = "okay";
++ status = "disabled";
+ ethernet0-port@0 {
+ speed = <1000>;
+ duplex = <1>;
--- /dev/null
+--- 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@200000 {
+- label = "kernel";
+- reg = <0x200000 0x2A0000>;
++ label = "kernel1";
++ reg = <0x200000 0x1A00000>;
+ };
+
+- partition@4a0000 {
+- label = "rootfs";
+- reg = <0x4A0000 0x1760000>;
++ partition@500000 {
++ label = "rootfs1";
++ reg = <0x500000 0x1700000>;
+ };
+
+ partition@1c00000 {
+- label = "alt_kernel";
+- reg = <0x1C00000 0x2A0000>;
++ label = "kernel2";
++ reg = <0x1C00000 0x1A00000>;
+ };
+
+- partition@1ea0000 {
+- label = "alt_rootfs";
+- reg = <0x1EA0000 0x1760000>;
++ partition@1f00000 {
++ label = "rootfs2";
++ reg = <0x1F00000 0x1700000>;
+ };
+
+ partition@3600000 {
--- /dev/null
+--- 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@100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
+- };
+-
+- partition@500000 {
+- label = "pogoplug";
+- reg = <0x0500000 0x2000000>;
+- };
+-
+- partition@2500000 {
+- label = "root";
+- reg = <0x02500000 0xd800000>;
++ label = "ubi";
++ reg = <0x0100000 0x0ff00000>;
+ };
+ };
+
--- /dev/null
+--- a/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
++++ b/arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+@@ -112,40 +112,16 @@
+
+ partition@0 {
+ label = "uboot";
+- reg = <0x0000000 0x0100000>;
++ reg = <0x0000000 0x00c0000>;
+ read-only;
+ };
+ partition@100000 {
+ label = "uboot_env";
+- reg = <0x0100000 0x0080000>;
++ reg = <0x00c0000 0x0080000>;
+ };
+- partition@180000 {
+- label = "key_store";
+- reg = <0x0180000 0x0080000>;
+- };
+- partition@200000 {
+- label = "info";
+- reg = <0x0200000 0x0080000>;
+- };
+- partition@280000 {
+- label = "etc";
+- reg = <0x0280000 0x0a00000>;
+- };
+- partition@c80000 {
+- label = "kernel_1";
+- reg = <0x0c80000 0x0a00000>;
+- };
+- partition@1680000 {
+- label = "rootfs1";
+- reg = <0x1680000 0x2fc0000>;
+- };
+- partition@4640000 {
+- label = "kernel_2";
+- reg = <0x4640000 0x0a00000>;
+- };
+- partition@5040000 {
+- label = "rootfs2";
+- reg = <0x5040000 0x2fc0000>;
++ partition@140000 {
++ label = "ubi";
++ reg = <0x0140000 0x7ec0000>;
+ };
+ };
+
--- /dev/null
+--- 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";
--- /dev/null
+--- 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@0 {
+- label = "u-boot";
+- reg = <0x00000000 0x200000>;
++ label = "uboot";
++ reg = <0x00000000 0x1c0000>;
+ read-only;
+ };
+
+- partition@200000 {
+- label = "uImage";
+- reg = <0x00200000 0x300000>;
+- };
+-
+- partition@500000 {
+- label = "uImage2";
+- reg = <0x00500000 0x300000>;
+- };
+-
+- partition@800000 {
+- label = "failsafe";
+- reg = <0x00800000 0x800000>;
++ partition@1c0000 {
++ label = "uboot_env";
++ reg = <0x001c0000 0x40000>;
+ };
+
+- partition@1000000 {
+- label = "root";
+- reg = <0x01000000 0x7000000>;
++ partition@200000 {
++ label = "ubi";
++ reg = <0x00200000 0x7e00000>;
+ };
+ };
+ };
--- /dev/null
+--- 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@0 {
+- label = "u-boot";
+- reg = <0x0000000 0x100000>;
++ label = "uboot";
++ reg = <0x0 0xe0000>;
+ read-only;
+ };
+
+- partition@100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
++ partition@e0000 {
++ label = "uboot_env";
++ reg = <0xe0000 0x20000>;
+ };
+
+- partition@500000 {
+- label = "pogoplug";
+- reg = <0x0500000 0x2000000>;
++ partition@100000 {
++ label = "second_stage_uboot";
++ reg = <0x100000 0x100000>;
+ };
+
+- partition@2500000 {
+- label = "root";
+- reg = <0x02500000 0x5b00000>;
++ partition@200000 {
++ label = "ubi";
++ reg = <0x200000 0x7e00000>;
+ };
+ };
+
--- /dev/null
+--- 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@100000 {
+- label = "kernel-1";
+- reg = <0x00100000 0x00800000>;
+- };
+-
+- partition@900000 {
+- label = "rootfs-1";
+- reg = <0x00900000 0x07100000>;
++ label = "ubi";
++ reg = <0x00100000 0x07900000>;
+ };
+
+ partition@7a00000 {
--- /dev/null
+--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
++++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+@@ -78,13 +78,8 @@
+ };
+
+ partition@100000 {
+- label = "uImage";
+- reg = <0x0100000 0x400000>;
+- };
+-
+- partition@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@f1000000 {
+ mvsdio@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 {
--- /dev/null
+--- 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@200000 {
+- label = "uImage";
++ label = "kernel";
+ reg = <0x0200000 0x600000>;
+ };
+
+ partition@800000 {
+- label = "minirootfs";
+- reg = <0x0800000 0x1000000>;
+- };
+-
+- partition@1800000 {
+- label = "jffs2";
+- reg = <0x1800000 0x6800000>;
++ label = "ubi";
++ reg = <0x0800000 0x7800000>;
+ };
+ };
+
--- /dev/null
+--- 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,15 @@
+ gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
+ };
+
+- led-4 {
++ led_status_red: led-4 {
++ label = "red:status";
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_RED>;
+ gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
+ };
+
+- led-5 {
++ led_status_green: led-5 {
++ label = "green:status";
+ function = LED_FUNCTION_STATUS;
+ color = <LED_COLOR_ID_GREEN>;
+ gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
--- /dev/null
+--- 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>;
--- /dev/null
+--- 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>;
--- /dev/null
+--- a/arch/arm/mach-mvebu/Kconfig
++++ b/arch/arm/mach-mvebu/Kconfig
+@@ -116,6 +116,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
--- /dev/null
+The WRT1900AC among other Linksys routers uses a dual-firmware layout.
+Dynamically rename the active partition to "ubi".
+
+Signed-off-by: Imre Kaloz <kaloz@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;
+@@ -133,9 +136,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))
+@@ -252,6 +261,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);
--- /dev/null
+--- 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@0 {
++ label = "uboot";
++ reg = <0x0 0xa0000>;
++ read-only;
++ };
++
++ partition@a0000 {
++ label = "uboot-env";
++ reg = <0xa0000 0x10000>;
++ read-only;
++ };
++
++ partition@b0000 {
++ label = "reserved";
++ reg = <0xb0000 0x10000>;
++ read-only;
++ };
++
++ partition@c0000 {
++ label = "ubi";
++ reg = <0xc0000 0x1e80000>;
++ };
++ };
+ };
+
+ &mdio {
projects / openwrt / staging / robimarko.git / commitdiff