dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / rt3050.dtsi

diff --git a/target/linux/ramips/dts/rt3050.dtsi b/target/linux/ramips/dts/rt3050.dtsi
index 84ddb061e6abc8db76e19f826072a14ffeaac533..492474fdc43f74325df78f28cd6569dda0d18143 100644 (file)
--- a/target/linux/ramips/dts/rt3050.dtsi
+++ b/target/linux/ramips/dts/rt3050.dtsi
@@ -1,8 +1,15 @@
+/dts-v1/;
+
 / {
        #address-cells = <1>;
        #size-cells = <1>;
        compatible = "ralink,rt3050-soc", "ralink,rt3052-soc", "ralink,rt3350-soc";
 
+       aliases {
+               spi0 = &spi0;
+               serial0 = &uartlite;
+       };
+
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
@@ -17,11 +24,6 @@
                bootargs = "console=ttyS0,57600";
        };
 
-       aliases {
-               spi0 = &spi0;
-               serial0 = &uartlite;
-       };
-
        cpuintc: cpuintc {
                #address-cells = <0>;
                #interrupt-cells = <1>;
@@ -108,8 +110,8 @@
                        gpio-controller;
                        #gpio-cells = <2>;
 
+                       ngpios = <24>;
                        ralink,gpio-base = <0>;
-                       ralink,nr-gpio = <24>;
                        ralink,register-map = [ 00 04 08 0c
                                                20 24 28 2c
                                                30 34 ];
@@ -128,8 +130,8 @@
                        gpio-controller;
                        #gpio-cells = <2>;
 
+                       ngpios = <16>;
                        ralink,gpio-base = <24>;
-                       ralink,nr-gpio = <16>;
                        ralink,register-map = [ 00 04 08 0c
                                                10 14 18 1c
                                                20 24 ];
@@ -144,8 +146,8 @@
                        gpio-controller;
                        #gpio-cells = <2>;
 
+                       ngpios = <12>;
                        ralink,gpio-base = <40>;
-                       ralink,nr-gpio = <12>;
                        ralink,register-map = [ 00 04 08 0c
                                                10 14 18 1c
                                                20 24 ];
@@ -245,36 +247,36 @@
 
                state_default: pinctrl0 {
                        sdram {
-                               ralink,group = "sdram";
-                               ralink,function = "sdram";
+                               groups = "sdram";
+                               function = "sdram";
                        };
                };
 
                i2c_pins: i2c_pins {
                        i2c_pins {
-                               ralink,group = "i2c";
-                               ralink,function = "i2c";
+                               groups = "i2c";
+                               function = "i2c";
                        };
                };
 
                spi_pins: spi_pins {
                        spi_pins {
-                               ralink,group = "spi";
-                               ralink,function = "spi";
+                               groups = "spi";
+                               function = "spi";
                        };
                };
 
                rgmii_pins: rgmii {
                        rgmii {
-                               ralink,group = "rgmii";
-                               ralink,function = "rgmii";
+                               groups = "rgmii";
+                               function = "rgmii";
                        };
                };
 
                uartlite_pins: uartlite {
                        uart {
-                               ralink,group = "uartlite";
-                               ralink,function = "uartlite";
+                               groups = "uartlite";
+                               function = "uartlite";
                        };
                };
        };
@@ -317,8 +319,8 @@
                compatible = "ralink,rt3050-esw";
                reg = <0x10110000 0x8000>;
 
-               resets = <&rstctrl 23>;
-               reset-names = "esw";
+               resets = <&rstctrl 23 &rstctrl 24>;
+               reset-names = "esw", "ephy";
 
                interrupt-parent = <&intc>;
                interrupts = <17>;