ramips: specify "firmware" partition format

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / ZBT-WR8305RT.dts

diff --git a/target/linux/ramips/dts/ZBT-WR8305RT.dts b/target/linux/ramips/dts/ZBT-WR8305RT.dts
index 4f226d901effb2253aeebb85482574b752d9eb3b..eafe778cf93f488fcb1632a6cc1d3e55151deb49 100644 (file)
--- a/target/linux/ramips/dts/ZBT-WR8305RT.dts
+++ b/target/linux/ramips/dts/ZBT-WR8305RT.dts
@@ -2,39 +2,49 @@
 
 #include "mt7620n.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
        compatible = "zbtlink,zbt-wr8305rt", "ralink,mt7620n-soc";
        model = "Zbtlink ZBT-WR8305RT";
 
+       aliases {
+               led-boot = &led_sys;
+               led-failsafe = &led_sys;
+               led-running = &led_sys;
+               led-upgrade = &led_sys;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
 
-               sys {
+               led_sys: sys {
                        label = "zbt-wr8305rt:green:sys";
-                       gpios = <&gpio1 14 1>;
+                       gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
                };
 
                lan {
                        label = "zbt-wr8305rt:green:usb";
-                       gpios = <&gpio1 15 1>;
+                       gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
                };
 
                wifi {
                        label = "zbt-wr8305rt:green:wifi";
-                       gpios = <&gpio3 0 1>;
+                       gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 1 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
        };
 };
@@ -51,34 +61,38 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
                compatible = "jedec,spi-nor";
-               reg = <0 0>;
-               linux,modalias = "m25p80", "en25q64";
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
-               partition@0 {
-                       label = "u-boot";
-                       reg = <0x0 0x30000>;
-                       read-only;
-               };
-
-               partition@30000 {
-                       label = "u-boot-env";
-                       reg = <0x30000 0x10000>;
-                       read-only;
-               };
-
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
-
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x7b0000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
+
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
+
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
+
+                       partition@50000 {
+                               compatible = "denx,uimage";
+                               label = "firmware";
+                               reg = <0x50000 0x7b0000>;
+                       };
                };
        };
 };
@@ -92,6 +106,8 @@
 };
 
 &ethernet {
+       pinctrl-names = "default";
+       pinctrl-0 = <&ephy_pins>;
        mtd-mac-address = <&factory 0x4>;
        mediatek,portmap = "llllw";
 };
@@ -102,11 +118,6 @@
 
 &pinctrl {
        state_default: pinctrl0 {
-               ephy {
-                       ralink,group = "ephy";
-                       ralink,function = "ephy";
-               };
-
                default {
                        ralink,group = "i2c", "uartf", "spi refclk", "wled";
                        ralink,function = "gpio";