ramips: improve Skylab SKW92A support

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / JHR-N926R.dts

diff --git a/target/linux/ramips/dts/JHR-N926R.dts b/target/linux/ramips/dts/JHR-N926R.dts
index f4dfd109fe8070339c95b5ce55d4e2765d3196be..c9da0138c65bbde991b61e66c01f6c696f902b83 100644 (file)
--- a/target/linux/ramips/dts/JHR-N926R.dts
+++ b/target/linux/ramips/dts/JHR-N926R.dts
@@ -1,18 +1,19 @@
 /dts-v1/;
 
-/include/ "rt3050.dtsi"
+#include "rt3050.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
-       compatible = "JHR-N926R", "ralink,rt3052-soc";
+       compatible = "jcg,jhr-n926r", "ralink,rt3052-soc";
        model = "JCG JHR-N926R";
 
-       pinctrl {
-               state_default: pinctrl0 {
-                       gpio {
-                               ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
-                               ralink,function = "gpio";
-                       };
-               };
+       aliases {
+               led-boot = &led_system;
+               led-failsafe = &led_system;
+               led-running = &led_system;
+               led-upgrade = &led_system;
        };
 
        cfi@1f000000 {
@@ -20,43 +21,35 @@
                reg = <0x1f000000 0x800000>;
                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;
-               };
 
-               factory: partition@40000 {
-                       label = "factory";
-                       reg = <0x40000 0x10000>;
-                       read-only;
-               };
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-               partition@50000 {
-                       label = "firmware";
-                       reg = <0x50000 0x3b0000>;
-               };
-       };
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x0 0x30000>;
+                               read-only;
+                       };
 
-       ethernet@10100000 {
-               mtd-mac-address = <&factory 0x2e>;
-       };
+                       partition@30000 {
+                               label = "u-boot-env";
+                               reg = <0x30000 0x10000>;
+                               read-only;
+                       };
 
-       esw@10110000 {
-               mediatek,portmap = <0x3e>;
-       };
+                       factory: partition@40000 {
+                               label = "factory";
+                               reg = <0x40000 0x10000>;
+                               read-only;
+                       };
 
-       wmac@10180000 {
-               ralink,mtd-eeprom = <&factory 0>;
+                       partition@50000 {
+                               label = "firmware";
+                               reg = <0x50000 0x3b0000>;
+                       };
+               };
        };
 
        gpio-leds {
@@ -64,22 +57,22 @@
 
                wlan1 {
                        label = "jhr-n926r:red:wlan";
-                       gpios = <&gpio0 20 1>;
+                       gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
                };
 
                wlan2 {
                        label = "jhr-n926r:yellow:wlan";
-                       gpios = <&gpio0 19 1>;
+                       gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
                };
 
                wlan3 {
                        label = "jhr-n926r:green:wlan";
-                       gpios = <&gpio0 17 1>;
+                       gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
                };
 
-               system {
+               led_system: system {
                        label = "jhr-n926r:blue:system";
-                       gpios = <&gpio0 13 1>;
+                       gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
                };
        };
 
@@ -90,38 +83,57 @@
                display_data {
                        gpio-export,name = "display_data";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 7 1>;
+                       gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
                };
 
                display_clock {
                        gpio-export,name = "display_clock";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 8 0>;
+                       gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>;
                };
 
                display_blank {
                        gpio-export,name = "display_blank";
                        gpio-export,output = <1>;
-                       gpios = <&gpio0 11 0>;
+                       gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
                };
        };
 
        gpio-keys-polled {
                compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
                poll-interval = <20>;
 
                reset_wps {
                        label = "reset_wps";
-                       gpios = <&gpio0 10 1>;
-                       linux,code = <0x198>;
+                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
                };
 
                wlan {
                        label = "wlan";
-                       gpios = <&gpio0 1 1>;
-                       linux,code = <0x100>;
+                       gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_0>;
+               };
+       };
+};
+
+&pinctrl {
+       state_default: pinctrl0 {
+               gpio {
+                       ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
+                       ralink,function = "gpio";
                };
        };
 };
+
+&ethernet {
+       mtd-mac-address = <&factory 0x2e>;
+};
+
+&esw {
+       mediatek,portmap = <0x3e>;
+};
+
+&wmac {
+       ralink,mtd-eeprom = <&factory 0>;
+};