dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / rt3052_aximcom_mr-102n.dts

diff --git a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
index c2bb9bb20f54bffc8078ec1acce35f0b3ffd926c..ada957fc52887e8ed0ca35737ed1d7804b904825 100644 (file)
--- a/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
+++ b/target/linux/ramips/dts/rt3052_aximcom_mr-102n.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "rt3050.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -16,7 +14,7 @@
                led-upgrade = &led_status;
        };
 
-       cfi@1f000000 {
+       flash@1f000000 {
                compatible = "cfi-flash";
                reg = <0x1f000000 0x800000>;
                bank-width = <2>;
@@ -67,19 +65,19 @@
                compatible = "gpio-leds";
 
                usb {
-                       label = "mr-102n:green:usb";
+                       label = "green:usb";
                        gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&otg_port1>;
                        linux,default-trigger = "usbport";
                };
 
                led_status: status {
-                       label = "mr-102n:amber:status";
+                       label = "amber:status";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wlan {
-                       label = "mr-102n:green:wlan";
+                       label = "green:wlan";
                        gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -104,25 +102,35 @@
 
 &state_default {
        gpio {
-               ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
-               ralink,function = "gpio";
+               groups = "i2c", "jtag", "rgmii", "mdio", "uartf";
+               function = "gpio";
        };
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &esw {
        status = "okay";
-       #mediatek,portmap = <0x3e>;
        mediatek,portmap = <0x2f>;
 };
 
 &wmac {
-       ralink,mtd-eeprom = <&factory 0>;
+       ralink,mtd-eeprom = <&factory 0x0>;
 };
 
 &otg {
        status = "okay";
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_4: macaddr@4 {
+               reg = <0x4 0x6>;
+       };
+};