oxnas: switch to DTS aliases for LEDs and use generic diag.sh

[openwrt/staging/jogo.git] / target / linux / oxnas / files / arch / arm / boot / dts / ox820-shuttle-kd20.dts

diff --git a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
index 9186d085855715384f6b160bc655d75c8ccb6016..40960d0f3d52badd4975c6673ef0279c1ec8a3a9 100644 (file)
--- a/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
+++ b/target/linux/oxnas/files/arch/arm/boot/dts/ox820-shuttle-kd20.dts
@@ -23,6 +23,10 @@
                serial0 = &uart0;
                gpio0 = &gpio0;
                gpio1 = &gpio1;
+               led-boot = &led_status;
+               led-failsafe = &led_warn;
+               led-running = &led_status;
+               led-upgrade = &led_warn;
        };
 
        i2c-gpio {
@@ -37,7 +41,7 @@
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
                #address-cells = <1>;
                #size-cells = <0>;
@@ -65,13 +69,13 @@
                };
        };
 
-       gpio-leds {
+       leds {
                compatible = "gpio-leds";
-               status {
+               led_status: status {
                        label = "kd20:blue:status";
                        gpios = <&gpio1 16 0>;
                };
-               status2 {
+               led_warn: status2 {
                        label = "kd20:red:status";
                        gpios = <&gpio1 17 0>;
                };
@@ -96,6 +100,8 @@
                usb {
                        label = "kd20:blue:usb";
                        gpios = <&gpio1 8 0>;
+                       trigger-sources = <&ehci_port1>, <&ehci_port2>;
+                       linux,default-trigger = "usbport";
                };
        };
 
@@ -145,10 +151,15 @@
 
                partition@40000 {
                        label = "u-boot";
-                       reg = <0x00040000 0x00200000>;
+                       reg = <0x00040000 0x001e0000>;
                        read-only;
                };
 
+               partition@220000 {
+                       label = "u-boot-env";
+                       reg = <0x00220000 0x00020000>;
+               };
+
                partition@240000 {
                        label = "initrd";
                        reg = <0x00240000 0x00600000>;