ramips: dts: Unify naming of gpio-keys nodes

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / YOUKU-YK1.dts

diff --git a/target/linux/ramips/dts/YOUKU-YK1.dts b/target/linux/ramips/dts/YOUKU-YK1.dts
index d4e3c905b3ae0f706d9d4ecb403014083465bea2..61fb3154e652588230178eba29be7e6dbfa80e44 100644 (file)
--- a/target/linux/ramips/dts/YOUKU-YK1.dts
+++ b/target/linux/ramips/dts/YOUKU-YK1.dts
@@ -9,6 +9,13 @@
        compatible = "youku,yk1", "ralink,mt7620a-soc";
        model = "YOUKU YK1";
 
+       aliases {
+               led-boot = &led_power;
+               led-failsafe = &led_power;
+               led-running = &led_power;
+               led-upgrade = &led_power;
+       };
+
        gpio-leds {
                compatible = "gpio-leds";
                wan {
@@ -22,17 +29,17 @@
                usb {
                        label = "youku-yk1:blue:usb";
                        gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
+                       trigger-sources = <&ohci_port1>, <&ehci_port1>;
+                       linux,default-trigger = "usbport";
                };
-               power {
+               led_power: power {
                        label = "youku-yk1:blue:power";
                        gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
                };
        };
 
-       gpio-keys-polled {
+       keys {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
                reset {
                        label = "reset";
@@ -62,33 +69,39 @@
        status = "okay";
 
        m25p80@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
+               compatible = "mx25l25635f", "jedec,spi-nor";
                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 0x1fb0000>;
+               spi-max-frequency = <25000000>;
+               m25p,fast-read;
+
+               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 0x1fb0000>;
+                       };
                };
        };
 };
@@ -96,7 +109,7 @@
 &pinctrl {
        state_default: pinctrl0 {
                default {
-                       ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
+                       ralink,group = "i2c", "rgmii1", "ephy", "wled";
                        ralink,function = "gpio";
                };
        };
@@ -104,7 +117,6 @@
 
 &ethernet {
        pinctrl-names = "default";
-       pinctrl-0 = <&ephy_pins>;
        mtd-mac-address = <&factory 0x4>;
        mediatek,portmap = "llllw";
 };