treewide: fix some cosmetic glitches in dts files

[openwrt/staging/wigyori.git] / target / linux / ramips / dts / DCS-930.dts

diff --git a/target/linux/ramips/dts/DCS-930.dts b/target/linux/ramips/dts/DCS-930.dts
index 98779f0647fe700286bcaa76507e53078277cff6..3c9c3d39f7d7074f19f9693ce129fffc365fa52b 100644 (file)
--- a/target/linux/ramips/dts/DCS-930.dts
+++ b/target/linux/ramips/dts/DCS-930.dts
@@ -2,17 +2,15 @@
 
 #include "rt3050.dtsi"
 
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
 / {
-       compatible = "DCS-930", "ralink,rt3050-soc";
+       compatible = "dlink,dcs-930", "ralink,rt3050-soc";
        model = "D-Link DCS-930";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
+       aliases {
+               led-status = &led_status;
        };
 
        cfi@1f000000 {
@@ -20,40 +18,34 @@
                reg = <0x1f000000 0x400000>;
                bank-width = <2>;
                device-width = <2>;
-               #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;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
 
-               partition@50000 {
-                       label = "kernel";
-                       reg = <0x50000 0x150000>;
-               };
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
 
-               partition@150000 {
-                       label = "rootfs";
-                       reg = <0x150000 0x2b0000>;
-               };
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
 
-               partition {
-                       label = "firmware";
-                       reg = <0x50000 0x3b0000>;
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x3b0000>;
+                       };
                };
        };
 
@@ -62,52 +54,59 @@
 
                wifi {
                        label = "dcs-930:red:alert";
-                       gpios = <&gpio0 8 1>;
+                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                };
 
-               power {
+               led_status: status {
                        label = "dcs-930:green:status";
-                       gpios = <&gpio0 9 1>;
+                       gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wps {
                        label = "dcs-930:blue:wps";
-                       gpios = <&gpio0 13 1>;
+                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 0 1>;
-                       linux,code = <0x101>;
+                       gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_1>;
                };
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
        };
+};
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x4>;
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "i2c", "spi", "jtag", "mdio", "rgmii", "uartf";
+                       ralink,function = "gpio";
+               };
        };
+};
 
-       esw@10110000 {
-               mediatek,portmap = <0x2f>;
-       };
+&ethernet {
+       mtd-mac-address = <&factory 0x4>;
+};
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
-       };
+&esw {
+       mediatek,portmap = <0x2f>;
+};
 
-       otg@101c0000 {
-               status = "okay";
-       };
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};
+
+&otg {
+       status = "okay";
 };