ramips: fix and tidy up DTS for D-Link DIR-810L

This patch addresses several issues for D-Link DIR-810L:

- add correct button codes
- harmonize button node names
- use generic flash@0
- remove unused pin groups from state_default
- improve sorting of properties

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>

diff --git a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
index 0b1ca26ba433a003fd13b4295e5a7c9a8fd0fb8b..514e9cc3540561e80d75fd382266d3af9a3313ca 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
+++ b/target/linux/ramips/dts/mt7620a_dlink_dir-810l.dts
@@ -23,20 +23,20 @@
                reset {
                        label = "reset";
                        gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
-                       linux,code = <BTN_0>;
+                       linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
                        gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <BTN_0>;
+                       linux,code = <KEY_WPS_BUTTON>;
                };
        };
 
        leds {
                compatible = "gpio-leds";
 
-               led_power_green: power {
+               led_power_green: power_green {
                        label = "dir-810l:green:power";
                        gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
                };
@@ -46,7 +46,7 @@
                        gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
                };
 
-               power2 {
+               power_orange {
                        label = "dir-810l:orange:power";
                        gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
                };
@@ -56,7 +56,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -119,7 +119,7 @@
 
 &state_default {
        gpio {
-               ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
+               ralink,group = "i2c", "uartf";
                ralink,function = "gpio";
        };
 };
@@ -130,9 +130,10 @@
 };
 
 &gsw {
-       mediatek,port4 = "ephy";
        pinctrl-names = "default";
        pinctrl-0 = <&ephy_pins>;
+
+       mediatek,port4 = "ephy";
 };
 
 &pcie {
@@ -140,9 +141,10 @@
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0x0>;
        pinctrl-names = "default";
        pinctrl-0 = <&pa_pins>;
+
+       ralink,mtd-eeprom = <&factory 0x0>;
        mtd-mac-address = <&factory 0x28>;
 };