dnsmasq: full: disable ipset support by default

[openwrt/staging/mkresin.git] / target / linux / ramips / dts / mt7621_asus_rt-acx5p.dtsi

diff --git a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
index 2de6d4c76140c40ad862031bbdb08d7d59fd8008..0ccc3c7ecc5fe71bbcb88cc633e8e373e5fcde57 100644 (file)
--- a/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
+++ b/target/linux/ramips/dts/mt7621_asus_rt-acx5p.dtsi
@@ -13,28 +13,18 @@
                led-upgrade = &led_power;
        };
 
-       chosen {
-               bootargs = "console=ttyS0,57600";
-       };
-
-       palmbus: palmbus@1E000000 {
-               i2c@900 {
-                       status = "okay";
-               };
-       };
-
        keys {
                compatible = "gpio-keys";
 
                reset {
                        label = "reset";
-                       gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_RESTART>;
                };
 
                wps {
                        label = "wps";
-                       gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
+                       gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_WPS_BUTTON>;
                };
        };
@@ -43,23 +33,28 @@
                compatible = "gpio-leds";
 
                led_power: power {
-                       label = "rt-ac85p:blue:power";
-                       gpios = <&gpio0 4 GPIO_ACTIVE_LOW>;
-               };
-               wlan2g {
-                       label = "rt-ac85p:blue:wlan2g";
-                       gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0radio";
+                       label = "blue:power";
+                       gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
                };
 
                wlan5g {
-                       label = "rt-ac85p:blue:wlan5g";
-                       gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+                       label = "blue:wlan5g";
+                       gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "phy1radio";
                };
+
+               wlan2g {
+                       label = "blue:wlan2g";
+                       gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0radio";
+               };
        };
 };
 
+&i2c {
+       status = "okay";
+};
+
 &sdhci {
        status = "okay";
 };
@@ -135,21 +130,53 @@
        };
 };
 
-&ethernet {
-       mtd-mac-address = <&factory 0xe000>;
-       mediatek,portmap = "wllll";
-       port@5 {
-               status = "disabled";
-       };
+&gmac0 {
+       nvmem-cells = <&macaddr_factory_e000>;
+       nvmem-cell-names = "mac-address";
 };
 
-&i2c {
-       status = "disabled";
+&switch0 {
+       ports {
+               port@0 {
+                       status = "okay";
+                       label = "wan";
+               };
+
+               port@1 {
+                       status = "okay";
+                       label = "lan1";
+               };
+
+               port@2 {
+                       status = "okay";
+                       label = "lan2";
+               };
+
+               port@3 {
+                       status = "okay";
+                       label = "lan3";
+               };
+
+               port@4 {
+                       status = "okay";
+                       label = "lan4";
+               };
+       };
 };
 
 &state_default {
        gpio {
-               ralink,group = "uart2", "uart3", "i2c";
-               ralink,function = "gpio";
+               groups = "uart2", "uart3", "i2c";
+               function = "gpio";
+       };
+};
+
+&factory {
+       compatible = "nvmem-cells";
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       macaddr_factory_e000: macaddr@e000 {
+               reg = <0xe000 0x6>;
        };
 };