dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7620a_edimax_br-6478ac-v2.dts

diff --git a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
index 0b991611b2238ab81c2b6783bc05a60fae078d11..cc902888baec5a1b8deee1e291a080c56496f94f 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
+++ b/target/linux/ramips/dts/mt7620a_edimax_br-6478ac-v2.dts
@@ -1,20 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
- * Device Tree file for the Edimax BR-6478AC V2
- * based on Linksys E1700
- *
  * Copyright (C) 2016 Rohan Murch <rohan.murch@gmail.com>
  * Copyright (C) 2016 Hans Ulli Kroll <ulli.kroll@googlemail.com>
  * Copyright (C) 2017 James McKenzie <openwrt@madingley.org>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
  */
 
 #include "mt7620a.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
 
 / {
        compatible = "edimax,br-6478ac-v2", "ralink,mt7620a-soc";
@@ -116,7 +111,9 @@
                        };
 
                        partition@70000 {
-                               compatible = "edimax,uimage";
+                               compatible = "openwrt,uimage", "denx,uimage";
+                               openwrt,offset = <FW_EDIMAX_OFFSET>;
+                               openwrt,partition-magic = <FW_MAGIC_EDIMAX>;
                                label = "firmware";
                                reg = <0x00070000 0x00790000>;
                        };
@@ -135,7 +132,8 @@
        pinctrl-names = "default";
        pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
-       mtd-mac-address = <&factory 0x4>;
+       nvmem-cells = <&macaddr_factory_4>;
+       nvmem-cell-names = "mac-address";
 
        mediatek,portmap = "wllll";
 
@@ -181,7 +179,7 @@
 };
 
 &gsw {
-       mediatek,port4 = "gmac";
+       mediatek,ephy-base = /bits/ 8 <12>;
 };
 
 &wmac {
@@ -207,3 +205,13 @@
 &ohci {
        status = "okay";
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_4: macaddr@4 {
+               reg = <0x4 0x6>;
+       };
+};