7a3a99c8a6
This commit is simple copy config, files and patches from 4.19 to 5.4 kernel. No changes was done. Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
81 lines
1.7 KiB
Diff
81 lines
1.7 KiB
Diff
--- 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>;
|
|
};
|
|
};
|
|
|