dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7621_mediatek_ap-mt7621a-v60.dts

diff --git a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
index b613c9c3710d096ec2ff8c0923112ff1e5abc8fa..43cf502b0b25f35dee1437f234ed877be5186a66 100644 (file)
--- a/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
+++ b/target/linux/ramips/dts/mt7621_mediatek_ap-mt7621a-v60.dts
@@ -1,20 +1,9 @@
-/dts-v1/;
-
 #include "mt7621.dtsi"
 
 / {
        compatible = "mediatek,ap-mt7621a-v60", "mediatek,mt7621-soc";
        model = "Mediatek AP-MT7621A-V60 EVB";
 
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
        sound {
                compatible = "simple-audio-card";
                simple-audio-card,name = "Audio-I2S";
@@ -41,17 +30,18 @@
        };
 };
 
-&pinctrl {
-       state_default: pinctrl0 {
-               gpio {
-                       ralink,group = "uart2", "rgmii2";
-                       ralink,function = "gpio";
-               };
+&state_default {
+       gpio {
+               groups = "uart2", "rgmii2";
+               function = "gpio";
        };
+};
+
+&pinctrl {
        i2s_pins: i2s {
                i2s {
-                       ralink,group = "uart3";
-                       ralink,function = "i2s";
+                       groups = "uart3";
+                       function = "i2s";
                };
        };
 };
@@ -81,9 +71,9 @@
 &spi0 {
        status = "okay";
 
-       mx25l6405d@0 {
+       flash@0 {
                compatible = "mx25l6405d","jedec,spi-nor";
-               reg = <0 0>;
+               reg = <0>;
                spi-max-frequency = <10000000>;
 
                partitions {
@@ -123,9 +113,56 @@
 };
 
 &ethernet {
-       mtd-mac-address = <&factory 0x5>;
+       pinctrl-0 = <&mdio_pins>, <&rgmii1_pins>;
+};
+
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_5>;
+       nvmem-cell-names = "mac-address";
+};
+
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan4";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "wan";
+                       nvmem-cells = <&macaddr_factory_5>;
+                       nvmem-cell-names = "mac-address";
+                       mac-address-increment = <1>;
+               };
+       };
 };
 
 &pcie {
        status = "okay";
 };
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_5: macaddr@5 {
+               reg = <0x5 0x6>;
+       };
+};