dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7620a_lenovo_newifi-y1.dts

diff --git a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
index b8c0ec8a836979d22c8b998153ce138d593e6d77..bff117b729519663ef019ed29dd8fe08b716a702 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
+++ b/target/linux/ramips/dts/mt7620a_lenovo_newifi-y1.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620a_lenovo_newifi-y1.dtsi"
 
 / {
@@ -11,40 +9,41 @@
                led-failsafe = &led_power;
                led-running = &led_power;
                led-upgrade = &led_power;
+               label-mac-device = &ethernet;
        };
 
        leds {
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "newifi-y1:blue:power";
+                       label = "blue:power";
                        gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
                };
 
                wlan1 {
-                       label = "newifi-y1:blue:wifi";
+                       label = "blue:wifi";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                wlan2 {
-                       label = "newifi-y1:blue:wifi5g";
+                       label = "blue:wifi5g";
                        gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
                };
 
                usb {
-                       label = "newifi-y1:blue:usb";
+                       label = "blue:usb";
                        gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
                        trigger-sources = <&ohci_port1>, <&ehci_port1>;
                        linux,default-trigger = "usbport";
                };
 
                lan {
-                       label = "newifi-y1:blue:lan";
+                       label = "blue:lan";
                        gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
                };
 
                internet {
-                       label = "newifi-y1:blue:internet";
+                       label = "blue:internet";
                        gpios = <&gpio2 11 GPIO_ACTIVE_LOW>;
                };
        };
@@ -53,6 +52,19 @@
 &ethernet {
        pinctrl-names = "default";
        pinctrl-0 = <&ephy_pins>;
-       mtd-mac-address = <&factory 0x28>;
+
+       nvmem-cells = <&macaddr_factory_28>;
+       nvmem-cell-names = "mac-address";
+
        mediatek,portmap = "llllw";
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_28: macaddr@28 {
+               reg = <0x28 0x6>;
+       };
+};