dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7620n_comfast_cf-wr800n.dts

diff --git a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
index df5b464dfdc0b9ffa7158bf4be17adc381cc0f41..b87e5a3530e522b35ddb6143ff57e5b0577a68c7 100644 (file)
--- a/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
+++ b/target/linux/ramips/dts/mt7620n_comfast_cf-wr800n.dts
@@ -1,5 +1,3 @@
-/dts-v1/;
-
 #include "mt7620n.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
@@ -24,17 +22,17 @@
                compatible = "gpio-leds";
 
                ethernet {
-                       label = "cf-wr800n:white:ethernet";
+                       label = "white:ethernet";
                        gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
                };
 
                wifi {
-                       label = "cf-wr800n:white:wifi";
+                       label = "white:wifi";
                        gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
                };
 
                led_wps: wps {
-                       label = "cf-wr800n:white:wps";
+                       label = "white:wps";
                        gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
                };
        };
@@ -50,10 +48,6 @@
        };
 };
 
-&gpio0 {
-       status = "okay";
-};
-
 &gpio1 {
        status = "okay";
 };
@@ -69,7 +63,7 @@
 &spi0 {
        status = "okay";
 
-       m25p80@0 {
+       flash@0 {
                compatible = "jedec,spi-nor";
                reg = <0>;
                spi-max-frequency = <10000000>;
@@ -107,7 +101,8 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 };
 
 &wmac {
@@ -120,3 +115,13 @@
                function = "gpio";
        };
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_4: macaddr@4 {
+               reg = <0x4 0x6>;
+       };
+};