Index: head/sys/gnu/dts/mips/3G150B.dts
===================================================================
--- head/sys/gnu/dts/mips/3G150B.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/3G150B.dts	(revision 300658)
@@ -1,116 +1,116 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "3G150B", "ralink,rt5350-soc";
 	model = "Tenda 3G150B";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		ap {
 			label = "3g150b:blue:ap";
 			gpios = <&gpio0 7 1>;
 		};
 
 		3g {
 			label = "3g150b:blue:3g";
 			gpios = <&gpio0 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 13 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 	ralink,led-polarity = <1>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/3G300M.dts
===================================================================
--- head/sys/gnu/dts/mips/3G300M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/3G300M.dts	(revision 300658)
@@ -1,122 +1,122 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "3G300M", "ralink,rt3052-soc";
 	model = "Tenda 3G300M";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		3grouter {
 			label = "3g300m:blue:3grouter";
 			gpios = <&gpio0 11 1>;
 		};
 
 		ap {
 			label = "3g300m:blue:ap";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wisprouter {
 			label = "3g300m:blue:wisprouter";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wirelessrouter {
 			label = "3g300m:blue:wirelessrouter";
 			gpios = <&gpio0 13 1>;
 		};
 
 		3g {
 			label = "3g300m:blue:3g";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wpsreset {
 			label = "3g300m:blue:wpsreset";
 			gpios = <&gpio0 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 
 		mode {
 			label = "mode";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x100>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &otg {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/A5-V11.dts
===================================================================
--- head/sys/gnu/dts/mips/A5-V11.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/A5-V11.dts	(revision 300658)
@@ -1,122 +1,122 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "A5-V11", "ralink,rt5350-soc";
 	model = "A5-V11";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		system {
 			label = "a5-v11:blue:system";
 			gpios = <&gpio0 20 1>;
 		};
 
 		power {
 			label = "a5-v11:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 7 0>;
 		};
 
 		root_hub {
 			gpio-export,name = "root_hub";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 12 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "pm25lq032";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf", "led";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x1>;
 	mediatek,portdisable = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/AIR3GII.dts
===================================================================
--- head/sys/gnu/dts/mips/AIR3GII.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/AIR3GII.dts	(revision 300658)
@@ -1,96 +1,96 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "AIR3GII", "ralink,rt5350-soc";
 	model = "AirLive Air3GII";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wlan {
 			label = "air3gii:green:wlan";
 			gpios = <&gpio0 8 0>;
 		};
 
 		mobile {
 			label = "air3gii:green:mobile";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 7 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q32b";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/ALL0256N-4M.dts
===================================================================
--- head/sys/gnu/dts/mips/ALL0256N-4M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ALL0256N-4M.dts	(revision 300658)
@@ -1,101 +1,101 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "ALL0256N", "ralink,rt3050-soc";
 	model = "Allnet ALL0256N";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		rssilow {
 			label = "all0256n:green:rssilow";
 			gpios = <&gpio0 14 1>;
 		};
 
 		rssimed {
 			label = "all0256n:green:rssimed";
 			gpios = <&gpio0 12 1>;
 		};
 
 		rssihigh {
 			label = "all0256n:green:rssihigh";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3c8000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x3f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/ALL0256N-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/ALL0256N-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ALL0256N-8M.dts	(revision 300658)
@@ -1,101 +1,101 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "ALL0256N", "ralink,rt3050-soc";
 	model = "Allnet ALL0256N";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		rssilow {
 			label = "all0256n:green:rssilow";
 			gpios = <&gpio0 14 1>;
 		};
 
 		rssimed {
 			label = "all0256n:green:rssimed";
 			gpios = <&gpio0 12 1>;
 		};
 
 		rssihigh {
 			label = "all0256n:green:rssihigh";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x3f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/ALL5002.dts
===================================================================
--- head/sys/gnu/dts/mips/ALL5002.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ALL5002.dts	(revision 300658)
@@ -1,109 +1,109 @@
 /dts-v1/;
 
 #include "rt3352.dtsi"
 
 / {
 	compatible = "ALL5002", "ralink,rt3352-soc";
 	model = "Allnet ALL5002";
 
 	i2c-gpio {
 		compatible = "i2c-gpio";
 		gpios = <&gpio0 1 0 &gpio0 2 0>;
 		i2c-gpio,delay-us = <10>;
 
 		pcf0: iexp@38 {
 			#gpio-cells = <2>;
 			compatible = "inxp,pcf8574a";
 			reg = <0x38>;
 			gpio-controller;
 		};
 
 		hwmon@4b {
 			compatible = "national,lm92";
 			reg = <0x4b>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		ld1 {
 			label = "all5002:green:ld1";
 			gpios = <&pcf0 0 1>;
 		};
 
 		ld2 {
 			label = "all5002:green:ld2";
 			gpios = <&pcf0 1 1>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l25635e";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x1fb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x3f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/ALL5003.dts
===================================================================
--- head/sys/gnu/dts/mips/ALL5003.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ALL5003.dts	(revision 300658)
@@ -1,109 +1,109 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "ALL5003", "ralink,rt5350-soc";
 	model = "Allnet ALL5003";
 
 	i2c-gpio {
 		compatible = "i2c-gpio";
 		gpios = <&gpio0 1 0 &gpio0 2 0>;
 		i2c-gpio,delay-us = <10>;
 
 		pcf0: iexp@38 {
 			#gpio-cells = <2>;
 			compatible = "inxp,pcf8574a";
 			reg = <0x38>;
 			gpio-controller;
 		};
 
 		hwmon@4b {
 			compatible = "national,lm92";
 			reg = <0x4b>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		ld1 {
 			label = "all5003:green:ld1";
 			gpios = <&pcf0 0 1>;
 		};
 
 		ld2 {
 			label = "all5003:green:ld2";
 			gpios = <&pcf0 1 1>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l25635e";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x1fb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x3f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/ASL26555-16M.dts
===================================================================
--- head/sys/gnu/dts/mips/ASL26555-16M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ASL26555-16M.dts	(revision 300658)
@@ -1,154 +1,154 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "ASL26555", "ralink,rt3050-soc";
 	model = "Alpha ASL26555";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 0>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 12 0>;
 			linux,code = <0x211>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		eth {
 			label = "asl26555:green:eth";
 			gpios = <&gpio0 0 1>;
 		};
 
 		wan-red {
 			label = "asl26555:red:wan";
 			gpios = <&gpio0 1 0>;
 		};
 
 		wan-green {
 			label = "asl26555:green:wan";
 			gpios = <&gpio0 2 0>;
 		};
 
 		wlan {
 			label = "asl26555:green:wlan";
 			gpios = <&gpio0 7 0>;
 		};
 
 		power-green {
 			label = "asl26555:green:power";
 			gpios = <&gpio0 8 0>;
 		};
 
 		power-red {
 			label = "asl26555:red:power";
 			gpios = <&gpio0 9 0>;
 		};
 
 		3g-green {
 			label = "asl26555:green:3g";
 			gpios = <&gpio0 14 1>;
 		};
 
 		3g-red {
 			label = "asl26555:red:3g";
 			gpios = <&gpio0 17 1>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25sl12801";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "uboot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf80000>;
 		};
 
 		partition@fd0000 {
 			label = "cert";
 			reg = <0xfd0000 0x10000>;
 			read-only;
 		};
 
 		partition@fe0000 {
 			label = "langpack";
 			reg = <0xfe0000 0x10000>;
 			read-only;
 		};
 
 		devdata: partition@ff0000 {
 			label = "devdata";
 			reg = <0xff0000 0x10000>;
 			read-only;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&devdata 0x4004>;
 };
 
 &esw {
 	mediatek,portmap = <0x1e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&devdata 0x4000>;
 };
 
 &otg {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/ASL26555-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/ASL26555-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ASL26555-8M.dts	(revision 300658)
@@ -1,148 +1,148 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "ASL26555", "ralink,rt3050-soc";
 	model = "Alpha ASL26555";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 0>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 12 0>;
 			linux,code = <0x211>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		eth {
 			label = "asl26555:green:eth";
 			gpios = <&gpio0 0 1>;
 		};
 
 		wan-red {
 			label = "asl26555:red:wan";
 			gpios = <&gpio0 1 0>;
 		};
 
 		wan-green {
 			label = "asl26555:green:wan";
 			gpios = <&gpio0 2 0>;
 		};
 
 		wlan {
 			label = "asl26555:green:wlan";
 			gpios = <&gpio0 7 0>;
 		};
 
 		power-green {
 			label = "asl26555:green:power";
 			gpios = <&gpio0 8 0>;
 		};
 
 		power-red {
 			label = "asl26555:red:power";
 			gpios = <&gpio0 9 0>;
 		};
 
 		3g-green {
 			label = "asl26555:green:3g";
 			gpios = <&gpio0 14 1>;
 		};
 
 		3g-red {
 			label = "asl26555:red:3g";
 			gpios = <&gpio0 17 1>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25sl064p";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		ubootenv: partition@30000 {
 			label = "uboot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "rgdb";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x790000>;
 		};
 
 		partition@7e0000 {
 			label = "cert";
 			reg = <0x7e0000 0x10000>;
 			read-only;
 		};
 
 		partition@7f0000 {
 			label = "langpack";
 			reg = <0x7f0000 0x10000>;
 			read-only;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&ubootenv 0x4004>;
 };
 
 &esw {
 	mediatek,portmap = <0x1e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&ubootenv 0x4000>;
 };
 
 &otg {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/AWAPN2403.dts
===================================================================
--- head/sys/gnu/dts/mips/AWAPN2403.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/AWAPN2403.dts	(revision 300658)
@@ -1,83 +1,83 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "AWAPN2403", "ralink,rt3052-soc";
 	model = "AsiaRF AWAPN2403";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		link {
 			label = "awapn2403:green:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &esw {
 	mediatek,portmap = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/AWM002.dtsi
===================================================================
--- head/sys/gnu/dts/mips/AWM002.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/AWM002.dtsi	(revision 300658)
@@ -1,76 +1,76 @@
 #include "rt5350.dtsi"
 
 / {
 	compatible = "AWM002", "ralink,rt5350-soc";
 	model = "AsiaRF AWM002";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		ld1 {
 			label = "awm002:green:ld1";
 			gpios = <&gpio0 0 1>;
 		};
 
 		ld2 {
 			label = "awm002:green:ld2";
 			gpios = <&gpio0 1 1>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80: m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		reg = <0 0>;
+		reg = <0>;
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x1fb0000>;
 		};
 	};
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &esw {
 	mediatek,portmap = <0x3f>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/ArcherC20i.dts
===================================================================
--- head/sys/gnu/dts/mips/ArcherC20i.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ArcherC20i.dts	(revision 300658)
@@ -1,116 +1,116 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "TP-Link Archer C20i";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x20000>;
 			read-only;
 		};
 
 		partition@20000 {
 			label = "firmware";
 			reg = <0x20000 0x7a0000>;
 		};
 
 		partition@7c0000 {
 			label = "config";
 			reg = <0x7c0000 0x10000>;
 		};
 
 		rom: partition@7d0000 {
 			label = "rom";
 			reg = <0x7d0000 0x10000>;
 		};
 
 		partition@7e0000 {
 			label = "romfile";
 			reg = <0x7e0000 0x10000>;
 		};
 
 		radio: partition@7f0000 {
 			label = "radio";
 			reg = <0x7f0000 0x10000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 		pinctrl-names = "default";
 		pinctrl-0 = <&ephy_pins>;
 		mtd-mac-address = <&rom 0xf100>;
 		mediatek,portmap = "wllll";
 	};
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&radio 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&radio 32768>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/CF-WR800N.dts
===================================================================
--- head/sys/gnu/dts/mips/CF-WR800N.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/CF-WR800N.dts	(revision 300658)
@@ -1,113 +1,113 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "cf-wr800n", "ralink,mt7620n-soc";
 	model = "Comfast CF-WR800N";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		ethernet {
 			label = "cf-wr800n:white:ethernet";
 			gpios = <&gpio2 4 1>;
 		};
 
 		wifi {
 			label = "cf-wr800n:white:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 		wps {
 			label = "cf-wr800n:white:wps";
 			gpios = <&gpio1 15 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "ephy", "wled", "spi refclk", "i2c";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/CS-QR10.dts
===================================================================
--- head/sys/gnu/dts/mips/CS-QR10.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/CS-QR10.dts	(revision 300658)
@@ -1,161 +1,161 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Planex CS-QR10";
 
 	sound {
 		compatible = "mediatek,mt7620-audio-wm8960";
 		model = "mt7620-wm8960";
 		i2s-controller = <&i2s>;
 		audio-routing =
 			"Ext Spk", "SPK_LP",
 			"Ext Spk", "SPK_LN",
 			"Ext Spk", "SPK_RP",
 			"Ext Spk", "SPK_RN";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "cs-qr10:red:power";
 			gpios = <&gpio1 4 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		s1 {
 			label = "reset";
 			gpios = <&gpio1 1 1>;
 			linux,code = <0x198>;
 		};
 
 		s2 {
 			label = "wps";
 			gpios = <&gpio1 3 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &i2c {
 	status = "okay";
 };
 
 &i2s {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pcm_i2s_pins>;
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pcm {
 	status = "okay";
 };
 
 &gdma {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "spi refclk", "rgmii1";
 			ralink,function = "gpio";
 		};
 		wdt {
 			ralink,group = "wdt";
 			ralink,function = "wdt refclk";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	ralink,port4 = "ephy";
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/DB-WRT01.dts
===================================================================
--- head/sys/gnu/dts/mips/DB-WRT01.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DB-WRT01.dts	(revision 300658)
@@ -1,98 +1,98 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Planex DB-WRT01";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "db-wrt01:orange:power";
 			gpios = <&gpio1 1 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		s1 {
 			label = "wps";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "spi refclk", "rgmii1";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/DCS-930L-B1.dts
===================================================================
--- head/sys/gnu/dts/mips/DCS-930L-B1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DCS-930L-B1.dts	(revision 300658)
@@ -1,106 +1,106 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "DCS-930L-B1", "ralink,rt5350-soc";
 	model = "D-Link DCS-930L B1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "dcs-930l-b1:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 
 		wps {
 			label = "dcs-930l-b1:blue:wps";
 			gpios = <&gpio0 19 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 20 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf", "led";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/DIR-300-B7.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-300-B7.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-300-B7.dts	(revision 300658)
@@ -1,101 +1,101 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "DIR-300-B7", "ralink,rt5350-soc";
 	model = "D-Link DIR-300 B7";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "dir-300-b7:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
 			label = "dir-300-b7:blue:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <0x17>;
 };
 
 &wmac {
 	status = "okay";
 	ralink,led-polarity = <1>;
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/DIR-320-B1.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-320-B1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-320-B1.dts	(revision 300658)
@@ -1,129 +1,129 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "DIR-320-B1", "ralink,rt5350-soc";
 	model = "D-Link DIR-320 B1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "dir-320-b1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		usb {
 			label = "dir-320-b1:green:usb";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wps {
 			label = "dir-320-b1:green:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 7 0>;
 		};
 
 		root_hub {
 			gpio-export,name = "root_hub";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 12 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <0x17>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/DIR-610-A1.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-610-A1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-610-A1.dts	(revision 300658)
@@ -1,102 +1,102 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "DIR-610-A1", "ralink,rt5350-soc";
 	model = "D-Link DIR-610 A1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "dir-610-a1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wps {
 			label = "dir-610-a1:green:wps";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		devdata: partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&devdata 0x4004>;
 };
 
 &esw {
 	status = "okay";
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <0x17>;
 };
 
 &wmac {
 	status = "okay";
 	ralink,led-polarity = <1>;
 	ralink,mtd-eeprom = <&devdata 0x4000>;
 };
Index: head/sys/gnu/dts/mips/DIR-615-H1.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-615-H1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-615-H1.dts	(revision 300658)
@@ -1,123 +1,123 @@
 /dts-v1/;
 
 #include "rt3352.dtsi"
 
 / {
 	compatible = "DIR-615-H1", "ralink,rt3352-soc";
 	model = "D-Link DIR-615 H1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "dir-615-h1:amber:status";
 			gpios = <&gpio0 7 0>;
 		};
 
 		status2 {
 			label = "dir-615-h1:green:status";
 			gpios = <&gpio0 9 0>;
 		};
 
 		wan {
 			label = "dir-615-h1:amber:wan";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wan2 {
 			label = "dir-615-h1:green:wan";
 			gpios = <&gpio0 13 1>;
 		};
 
 		wps {
 			label = "dir-615-h1:blue:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 
 		rgmii {
 			ralink,group = "rgmii";
 			ralink,function = "rgmii";
 		};
 
 		mdio {
 			ralink,group = "mdio";
 			ralink,function = "mdio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/DIR-620-D1.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-620-D1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-620-D1.dts	(revision 300658)
@@ -1,110 +1,110 @@
 /dts-v1/;
 
 #include "rt3352.dtsi"
 
 / {
 	compatible = "DIR-620-D1", "ralink,rt3352-soc";
 	model = "D-Link DIR-620 D1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "dir-620-d1:green:status";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi {
 			label = "dir-620-d1:green:wifi";
 			gpios = <&gpio0 17 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset_wps {
 			label = "reset_wps";
 			gpios = <&gpio0 7 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 
 		rgmii {
 			ralink,group = "rgmii";
 			ralink,function = "rgmii";
 		};
 
 		mdio {
 			ralink,group = "mdio";
 			ralink,function = "mdio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/DIR-645.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-645.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-645.dts	(revision 300658)
@@ -1,140 +1,140 @@
 /dts-v1/;
 
 #include "rt3883.dtsi"
 
 / {
 	compatible = "DIR-645", "ralink,rt3883-soc";
 	model = "D-Link DIR-645";
 
 	rtl8367b {
 		compatible = "realtek,rtl8367b";
 		gpio-sda = <&gpio0 1 0>;
 		gpio-sck = <&gpio0 2 0>;
 		realtek,extif1 = <1 0 1 1 1 1 1 1 2>;
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <100>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 9 0>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 14 0>;
 			linux,code = <0x211>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		inet {
 			label = "dir-645:green:inet";
 			gpios = <&gpio0 0 1>;
 		};
 
 		wps {
 			label = "dir-645:green:wps";
 			gpios = <&gpio1 2 0>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
 			gpios = <&gpio1 6 0>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <25000000>;
 
 		partition@0 {
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "uboot-env";
 			reg = <0x30000 0x4000>;
 			read-only;
 		};
 
 		factory: partition@34000 {
 			label = "factory";
 			reg = <0x34000 0x4000>;
 			read-only;
 		};
 
 		partition@38000 {
 			label = "nvram";
 			reg = <0x38000 0x8000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "devdata";
 			reg = <0x40000 0x10000>;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 
 	port@0 {
 		mediatek,fixed-link = <1000 1 1 0>;
 	};
 };
 
 &wmac {
 	ralink,5ghz = <0>;
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/DIR-810L.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-810L.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-810L.dts	(revision 300658)
@@ -1,134 +1,134 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "dlink,dir-810l", "ralink,mt7620a-soc";
 	model = "D-Link DIR-810L";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x100>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x100>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "dir-810l:green:power";
 			gpios = <&gpio0 9 0>;
 		};
 
 		wan {
 			label = "dir-810l:orange:wan";
 			gpios = <&gpio0 12 0>;
 		};
 
 		status {
 			label = "dir-810l:orange:power";
 			gpios = <&gpio0 13 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		factory5g: partition@50000 {
 			label = "factory5g";
 			reg = <0x50000 0x10000>;
 			read-only;
 		};
 
 		partition@60000 {
 			label = "Wolf_Config";
 			reg = <0x60000 0x10000>;
 			read-only;
 		};
 
 		partition@70000 {
 			label = "MyDlink";
 			reg = <0x70000 0x80000>;
 			read-only;
 		};
 
 		partition@e0000 {
 			label = "Jffs2";
 			reg = <0xe0000 0x80000>;
 			read-only;
 		};
 
 		partition@170000 {
 			label = "firmware";
 			reg = <0x170000 0x690000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "mdio", "rgmii1", "i2c", "wled", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 };
 
 &pcie {
 	status = "okay";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/DIR-860L-B1.dts
===================================================================
--- head/sys/gnu/dts/mips/DIR-860L-B1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/DIR-860L-B1.dts	(revision 300658)
@@ -1,127 +1,127 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "D-Link DIR-860L B1";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "dir-860l-b1:orange:power";
 			gpios = <&gpio0 13 1>;
 		};
 
 		power2 {
 			label = "dir-860l-b1:green:power";
 			gpios = <&gpio0 15 1>;
 		};
 
 		net {
 			label = "dir-860l-b1:orange:net";
 			gpios = <&gpio0 14 1>;
 		};
 
 		net2 {
 			label = "dir-860l-b1:green:net";
 			gpios = <&gpio0 16 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x4000>;
 			read-only;
 		};
 
 		radio: partition@34000 {
 			label = "radio";
 			reg = <0x34000 0x4000>;
 			read-only;
 		};
 
 		factory: partition@38000 {
 			label = "factory";
 			reg = <0x38000 0x8000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "defaults";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&radio 0x2000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&radio 0>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/E1700.dts
===================================================================
--- head/sys/gnu/dts/mips/E1700.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/E1700.dts	(revision 300658)
@@ -1,152 +1,152 @@
 /*
  * Device Tree file for the Linksys E1700
  *
  * Copyright (C) 2014 Imre Kaloz <kaloz@openwrt.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.
  */
 
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "linksys,e1700", "ralink,mt7620a-soc";
 	model = "Linksys E1700";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 0>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 2 0>;
 			linux,code = <0x211>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "e1700:green:power";
 			gpios = <&gpio0 10 1>;
 		};
 
 		wan {
 			label = "e1700:green:wps";
 			gpios = <&gpio0 12 1>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "config";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	status = "okay";
 	mtd-mac-address = <&factory 0x28>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 
 	port@5 {
 		status = "okay";
 		mediatek,fixed-link = <1000 1 1 1>;
 		phy-mode = "rgmii";
 	};
 
 	mdio-bus {
 		status = "okay";
 
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 			phy-mode = "rgmii";
 		};
 
 		phy1: ethernet-phy@1 {
 			reg = <1>;
 			phy-mode = "rgmii";
 		};
 
 		phy2: ethernet-phy@2 {
 			reg = <2>;
 			phy-mode = "rgmii";
 		};
 
 		phy3: ethernet-phy@3 {
 			reg = <3>;
 			phy-mode = "rgmii";
 		};
 
 		phy4: ethernet-phy@4 {
 			reg = <4>;
 			phy-mode = "rgmii";
 		};
 
 		phy1f: ethernet-phy@1f {
 			reg = <0x1f>;
 			phy-mode = "rgmii";
 		};
 	};
 };
 
 &gsw {
 	mediatek,port4 = "gmac";
 	mediatek,mt7530 = <1>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/EX2700.dts
===================================================================
--- head/sys/gnu/dts/mips/EX2700.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/EX2700.dts	(revision 300658)
@@ -1,145 +1,145 @@
 /*
  * Device Tree file for the Netgear EX2700
  *
  * Copyright (C) 2016 Joseph C. Lehner <joseph.c.lehner@gmail.com>
  *
  * 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.
  */
 
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Netgear EX2700";
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power_g {
 			label = "ex2700:green:power";
 			gpios = <&gpio0 9 1>;
 			default-state = "on";
 		};
 
 		power_r {
 			label = "ex2700:red:power";
 			gpios = <&gpio0 11 1>;
 		};
 
 		device_g {
 			label = "ex2700:green:device";
 			gpios = <&gpio0 13 1>;
 		};
 
 		device_r {
 			label = "ex2700:red:device";
 			gpios = <&gpio0 10 1>;
 		};
 
 		router_g {
 			label = "ex2700:green:router";
 			gpios = <&gpio0 12 1>;
 		};
 
 		router_r {
 			label = "ex2700:red:router";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wps {
 			label = "ex2700:green:wps";
 			gpios = <&gpio1 15 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "firmware";
 			reg = <0x40000 0x3b0000>;
 		};
 
 		art: partition@3f0000 {
 			label = "art";
 			reg = <0x3f0000 0x10000>;
 			read-only;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&art 0x0>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&art 0x1000>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			//  spi refclk: pins 37, 38, 39
 			//       uartf: pins 8, 9, 10, 11, 12, 13, 14
 			//         i2c: pins 1, 2
 			ralink,group = "i2c", "uartf", "spi refclk";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/F7C027.dts
===================================================================
--- head/sys/gnu/dts/mips/F7C027.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/F7C027.dts	(revision 300658)
@@ -1,131 +1,131 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "F7C027", "ralink,rt5350-soc";
 	model = "Belkin F7C027";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "f7c027:blue:status";
 			gpios = <&gpio0 7 1>;
 		};
 
 		power {
 			label = "f7c027:blue:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		orange {
 			label = "f7c027:orange:status";
 			gpios = <&gpio0 11 1>;
 		};
 
 		relay {
 			label = "f7c027:device:relay";
 			gpios = <&gpio0 13 0>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		top {
 			label = "top";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		power {
 			label = "power";
 			gpios = <&gpio0 12 1>;
 			linux,code = <0x100>;
 		};
 
 		sensor {
 			label = "sensor";
 			gpios = <&gpio0 14 1>;
 			linux,code = <0x101>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l12805d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x770000>;
 		};
 
 		partition@7c0000 {
 			label = "firmware2";
 			reg = <0x7c0000 0x770000>;
 		};
 
 		partition@f30000 {
 			label = "belkin_settings";
 			reg = <0xf30000 0xa0000>;
 		};
 
 		partition@fd0000 {
 			label = "unknown";
 			reg = <0xfd0000 0x10000>;
 		};
 
 		partition@fe0000 {
 			label = "nvram";
 			reg = <0xfe0000 0x10000>;
 		};
 
 		partition@ff0000 {
 			label = "user_factory";
 			reg = <0xff0000 0x10000>;
 		};
 	};
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/FIREWRT.dts
===================================================================
--- head/sys/gnu/dts/mips/FIREWRT.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/FIREWRT.dts	(revision 300658)
@@ -1,120 +1,120 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Firefly FireWRT";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "firewrt:green:power";
 			gpios = <&gpio0 22 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x211>;
 		};
 
 		power {
 			label = "power";
 			gpios = <&gpio0 23 1>;
 			linux,code = <116>;
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wdt", "rgmii2";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/GL-MT300A.dts
===================================================================
--- head/sys/gnu/dts/mips/GL-MT300A.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/GL-MT300A.dts	(revision 300658)
@@ -1,162 +1,162 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "GL-MT300A", "ralink,mt7620a-soc";
 	model = "GL-MT300A";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wan {
 			label = "gl-mt300a:wan";
 			gpios = <&gpio2 0 1>;
 		};
 
 		lan {
 			label = "gl-mt300a:lan";
 			gpios = <&gpio2 1 1>;
 		};
 
 		wlan {
 			label = "gl-mt300a:wlan";
 			gpios = <&gpio3 0 1>;
 		};
 
 		usb {
 			label = "gl-mt300a:usb";
 			gpios = <&gpio0 7 1>;
 		};
 
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		reset {
 			label = "reset";
 			gpios = <&gpio0 13 1>;
 			linux,code = <0x198>;
 		};
 
 		BTN_0 {
 			label = "BTN_0";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x100>;
 		};
 
   	    BTN_1 {
 			label = "BTN_1";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x101>;
 		};
  	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 		
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf80000>;
 		};
 
 		partition@ff0000 {
 			label = "art";
 			reg = <0xff0000 0x10000>;
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4000>;
 	ralink,port-map = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wled","ephy","uartf","i2c";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/GL-MT300N.dts
===================================================================
--- head/sys/gnu/dts/mips/GL-MT300N.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/GL-MT300N.dts	(revision 300658)
@@ -1,151 +1,151 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "GL-MT300N", "ralink,mt7620a-soc";
 	model = "GL-MT300N";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wan {
 			label = "gl-mt300n:wan";
 			gpios = <&gpio2 0 1>;
 		};
 
 		lan {
 			label = "gl-mt300n:lan";
 			gpios = <&gpio2 1 1>;
 		};
 
 		wlan {
 			label = "gl-mt300n:wlan";
 			gpios = <&gpio3 0 1>;
 		};
 
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		BTN_0 {
 			label = "BTN_0";
 			gpios = <&gpio2 2 1>;
 			linux,code = <0x100>;
 		};
 
   	    BTN_1 {
 			label = "BTN_1";
 			gpios = <&gpio2 3 1>;
 			linux,code = <0x101>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 		
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf80000>;
 		};
 
 		partition@ff0000 {
 			label = "art";
 			reg = <0xff0000 0x10000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4000>;
 	ralink,port-map = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wled","ephy","i2c";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/GL-MT750.dts
===================================================================
--- head/sys/gnu/dts/mips/GL-MT750.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/GL-MT750.dts	(revision 300658)
@@ -1,157 +1,157 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "GL-MT750", "ralink,mt7620a-soc";
 	model = "GL-MT750";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wan {
 			label = "gl-mt750:wan";
 			gpios = <&gpio2 0 1>;
 		};
 
 		lan {
 			label = "gl-mt750:lan";
 			gpios = <&gpio2 1 1>;
 		};
 
 		wlan {
 			label = "gl-mt750:wlan";
 			gpios = <&gpio3 0 1>;
 		};
 
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		reset {
 			label = "reset";
 			gpios = <&gpio0 13 1>;
 			linux,code = <0x198>;
 		};
 
 		BTN_0 {
 			label = "BTN_0";
 			gpios = <&gpio2 2 1>;
 			linux,code = <0x100>;
 		};
 
   	    BTN_1 {
 			label = "BTN_1";
 			gpios = <&gpio2 3 1>;
 			linux,code = <0x101>;
 		};
  	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 		
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf80000>;
 		};
 
 		partition@ff0000 {
 			label = "art";
 			reg = <0xff0000 0x10000>;
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4000>;
 	ralink,port-map = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wled","ephy","uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/HC5XXX.dtsi
===================================================================
--- head/sys/gnu/dts/mips/HC5XXX.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/HC5XXX.dtsi	(revision 300658)
@@ -1,139 +1,139 @@
 #include "mt7620a.dtsi"
 
 / {
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 12 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usbpower {
 			gpio-export,name = "usbpower";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 13 0>;
 		};
 	};
 };
 
 &sysc {
 	ralink,gpiomux = "i2c", "jtag";
 	ralink,uartmux = "gpio";
 	ralink,wdtmux = <1>;
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf80000>;
 		};
 
 		partition@fd0000 {
 			label = "hwf_config";
 			reg = <0xfd0000 0x10000>;
 		};
 
 		bdinfo: partition@fe0000 {
 			label = "bdinfo";
 			reg = <0xfe0000 0x10000>;
 		};
 
 		partition@ff0000 {
 			label = "backup";
 			reg = <0xff0000 0x10000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uartf", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 
 		pa {
 			ralink,group = "pa";
 			ralink,function = "pa";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/HLKRM04.dts
===================================================================
--- head/sys/gnu/dts/mips/HLKRM04.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/HLKRM04.dts	(revision 300658)
@@ -1,123 +1,123 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "HLKRM04", "ralink,rt5350-soc";
 	model = "HILINK HLK-RM04";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x1000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS1,57600";
 	};
 
 	gpio-export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		/* I2C */
 		gpio1 {
 			/* I2C_I2C_SD */
 			gpio-export,name = "hlk-rm04:gpio0";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 1 0>;
 		};
 		gpio2 {
 			/* I2C_I2C_SCLK */
 			gpio-export,name = "hlk-rm04:gpio1";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 2 0>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		reset {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 		wps {
 			label = "wps";
 			gpios = <&gpio0 14 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &uart {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag";
 			ralink,function = "gpio";
 		};
 
 		uartf_gpio {
 			ralink,group = "uartf";
 			ralink,function = "gpio uartf";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/HT-TM02.dts
===================================================================
--- head/sys/gnu/dts/mips/HT-TM02.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/HT-TM02.dts	(revision 300658)
@@ -1,112 +1,112 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "HT-TM02", "ralink,rt5350-soc";
 	model = "HooToo HT-TM02";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wlan {
 			label = "ht-tm02:blue:wlan";
 			gpios = <&gpio0 7 1>;
 		};
 
 		lan {
 			label = "ht-tm02:green:lan";
 			gpios = <&gpio0 12 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		modeswitch {
 			label = "modeswitch";
 			gpios = <&gpio0 14 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x10>;
 	mediatek,portdisable = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/JHR-N805R.dts
===================================================================
--- head/sys/gnu/dts/mips/JHR-N805R.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/JHR-N805R.dts	(revision 300658)
@@ -1,87 +1,87 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "JHR-N805R", "ralink,rt3050-soc";
 	model = "JCG JHR-N805R";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		system {
 			label = "jhr-n805r:blue:system";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
         gpio-keys-polled {
                 compatible = "gpio-keys-polled";
                 #address-cells = <1>;
                 #size-cells = <0>;
                 poll-interval = <20>;
 
                 reset {
                         label = "reset";
                         gpios = <&gpio0 10 1>;
                         linux,code = <0x198>;
                 };
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x2e>;
 };
 
 &esw {
 	mediatek,portmap = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/LINKIT7688.dts
===================================================================
--- head/sys/gnu/dts/mips/LINKIT7688.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/LINKIT7688.dts	(revision 300658)
@@ -1,182 +1,182 @@
 /dts-v1/;
 
 #include "mt7628an.dtsi"
 
 / {
 	compatible = "mediatek,linkit", "mediatek,mt7628an-soc";
 	model = "MediaTek LinkIt Smart 7688";
 
 	chosen {
 		bootargs = "console=ttyS2,57600";
 	};
 
 	aliases {
 		serial0 = &uart2;
 	};
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
 
 	bootstrap {
 		compatible = "mediatek,linkit";
 
 		status = "okay";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wifi {
 			label = "mediatek:orange:wifi";
 			gpios = <&wgpio 0 0>;
 			default-state = "on";
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "reset";
 			gpios = <&gpio1 6 1>;
 			linux,code = <0x211>;
 		};
 	};
 
 	wgpio: gpio-wifi {
 		compatible = "mediatek,gpio-wifi";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "gpio";
 			ralink,function = "gpio";
 		};
 
 		perst {
 			ralink,group = "perst";
 			ralink,function = "gpio";
 		};
 
 		refclk {
 			ralink,group = "refclk";
 			ralink,function = "gpio";
 		};
 
 		i2s {
 			ralink,group = "i2s";
 			ralink,function = "gpio";
 		};
 
 		spis {
 			ralink,group = "spis";
 			ralink,function = "gpio";
 		};
 
 		wled_kn {
 			ralink,group = "wled_kn";
 			ralink,function = "gpio";
 		};
 
 		wled_an {
 			ralink,group = "wled_an";
 			ralink,function = "wled_an";
 		};
 
 		wdt {
 			ralink,group = "wdt";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &wmac {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l25635e";
 		spi-max-frequency = <40000000>;
 		m25p,chunked-io = <31>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x1fb0000>;
 		};
 	};
 
 	spidev@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "spidev";
-		reg = <1 0>;
+		compatible = "linux,spidev";
+		reg = <1>;
 		spi-max-frequency = <40000000>;
 	};
 };
 
 &i2c {
 	status = "okay";
 };
 
 &uart1 {
 	status = "okay";
 };
 
 &uart2 {
 	status = "okay";
 };
 
 &pwm {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &sdhci {
 	status = "okay";
 	mediatek,cd-high;
 };
 
 &wmac {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/M2M.dts
===================================================================
--- head/sys/gnu/dts/mips/M2M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/M2M.dts	(revision 300658)
@@ -1,110 +1,110 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "M2M", "ralink,rt5350-soc";
 	model = "Intenso Memory 2 Move";
 
 	chosen {
 		bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wifi {
 			label = "m2m:blue:wifi";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wan {
 			label = "m2m:green:wan";
 			gpios = <&gpio0 12 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		power {
 			label = "power";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x116>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "Bootloader";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "Config";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "Factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0x0>;
 };
Index: head/sys/gnu/dts/mips/M3.dts
===================================================================
--- head/sys/gnu/dts/mips/M3.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/M3.dts	(revision 300658)
@@ -1,104 +1,104 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "M3", "ralink,rt5350-soc";
 	model = "Poray M3";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "m3:blue:status";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		mode {
 			label = "mode";
 			gpios = <&gpio0 17 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q32";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <1>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 	ralink,led-polarity = <1>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/M4-4M.dts
===================================================================
--- head/sys/gnu/dts/mips/M4-4M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/M4-4M.dts	(revision 300658)
@@ -1,92 +1,92 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "M4", "ralink,rt5350-soc";
 	model = "Poray M4";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "m4:blue:status";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "pm25lq032";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <1>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/M4-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/M4-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/M4-8M.dts	(revision 300658)
@@ -1,97 +1,97 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "M4", "ralink,rt5350-soc";
 	model = "Poray M4";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "m4:blue:status";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "gd25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <1>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 	ralink,led-polarity = <1>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MINIEMBPLUG.dts
===================================================================
--- head/sys/gnu/dts/mips/MINIEMBPLUG.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MINIEMBPLUG.dts	(revision 300658)
@@ -1,122 +1,122 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "MINIEMBPLUG", "ralink,rt5350-soc";
 	model = "Omnima MiniEMBPlug";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wlan {
 			label = "miniembplug:red:wlan";
 			gpios = <&gpio0 9 0>;
 		};
 
 		mobile {
 			label = "miniembplug:green:mobile";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x211>;
 		};
 
 		mode-one {
 			label = "mode1";
 			gpios = <&gpio0 11 1>;
 			linux,code = <0x211>;
 		};
 
 		mode-two {
 			label = "mode2";
 			gpios = <&gpio0 12 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MIWIFI-MINI.dts
===================================================================
--- head/sys/gnu/dts/mips/MIWIFI-MINI.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MIWIFI-MINI.dts	(revision 300658)
@@ -1,153 +1,153 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "xiaomi,miwifi-mini", "ralink,mt7620a-soc";
 	model = "Xiaomi MiWiFi Mini";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		blue {
 			label = "miwifi-mini:blue:status";
 			gpios = <&gpio1 0 1>;
 		};
 
 		yellow {
 			label = "miwifi-mini:yellow:status";
 			gpios = <&gpio1 2 1>;
 		};
 
 		red {
 			label = "miwifi-mini:red:status";
 			gpios = <&gpio1 5 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio1 6 0>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf80000>;
 		};
 
 		partition@fd0000 {
 			label = "crash";
 			reg = <0xfd0000 0x10000>;
 		};
 
 		partition@fe0000 {
 			label = "reserved";
 			reg = <0xfe0000 0x10000>;
 			read-only;
 		};
 
 		partition@ff0000 {
 			label = "Bdata";
 			reg = <0xff0000 0x10000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "rgmii1";
 			ralink,function = "gpio";
 		};
 
 		pa {
 			ralink,group = "pa";
 			ralink,function = "pa";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/MIWIFI-NANO.dts
===================================================================
--- head/sys/gnu/dts/mips/MIWIFI-NANO.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MIWIFI-NANO.dts	(revision 300658)
@@ -1,88 +1,88 @@
 /dts-v1/;
 
 #include "mt7628an.dtsi"
 
 / {
 	compatible = "xiaomi,MiWifi Nano", "mediatek,mt7628an-soc";
 	model = "MiWiFi Nano";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x4000000>;
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wifi {
 			label = "miwifi-nano:blue:wifi";
 			gpios = <&gpio0 11 1>;
 			default-state = "1";
 		};
 		status {
 			label = "miwifi-nano:red:status";
 			gpios = <&gpio1 5 1>;
 			default-state = "on";
 		};
 		radio {
 			label = "miwifi-nano:amber:radio";
 			gpios = <&gpio1 12 1>;
 			default-state = "1";
 
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "refclk", "wled", "gpio";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &wmac {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/MLW221.dts
===================================================================
--- head/sys/gnu/dts/mips/MLW221.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MLW221.dts	(revision 300658)
@@ -1,120 +1,120 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "mlw221", "ralink,mt7620n-soc";
 	model = "Kingston MLW221";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		system {
 			label = "mlw221:blue:system";
 			gpios = <&gpio2 3 1>;
 		};
 
 		wifi {
 			label = "mlw221:blue:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		system {
 			label = "system";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl129p1";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf60000>;
 		};
 
 		partition@fb0000 {
 			label = "user-config";
 			reg = <0xfb0000 0x50000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "ephy", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/MLWG2.dts
===================================================================
--- head/sys/gnu/dts/mips/MLWG2.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MLWG2.dts	(revision 300658)
@@ -1,120 +1,120 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "mlwg2", "ralink,mt7620n-soc";
 	model = "Kingston MLWG2";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		system {
 			label = "mlwg2:blue:system";
 			gpios = <&gpio2 3 1>;
 		};
 
 		wifi {
 			label = "mlwg2:blue:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		system {
 			label = "system";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf60000>;
 		};
 
 		partition@fb0000 {
 			label = "user-config";
 			reg = <0xfb0000 0x50000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "ephy", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/MPRA1.dts
===================================================================
--- head/sys/gnu/dts/mips/MPRA1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MPRA1.dts	(revision 300658)
@@ -1,121 +1,121 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "MPRA1", "ralink,rt5350-soc";
 	model = "HAME MPR-A1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		system {
 			label = "mpr-a1:blue:system";
 			gpios = <&gpio0 20 1>;
 		};
 
 		power {
 			label = "mpr-a1:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 7 0>;
 		};
 
 		root_hub {
 			gpio-export,name = "root_hub";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 12 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf", "led";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MPRA2.dts
===================================================================
--- head/sys/gnu/dts/mips/MPRA2.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MPRA2.dts	(revision 300658)
@@ -1,117 +1,118 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "MPRA2", "ralink,rt5350-soc";
 	model = "HAME MPR-A2";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		system {
 			label = "mpr-a2:blue:system";
 			gpios = <&gpio0 20 1>;
 		};
 
 		power {
 			label = "mpr-a2:red:power";
 			gpios = <&gpio0 17 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "reset";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb {
 			gpio-export,name = "usb";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 7 0>;
 		};
 
 		root_hub {
 			gpio-export,name = "root_hub";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 12 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
-	mediatek,portmap = <0x2f>;
+	mediatek,portmap = <0x1>;
+	mediatek,portdisable = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MT7620a.dts
===================================================================
--- head/sys/gnu/dts/mips/MT7620a.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MT7620a.dts	(revision 300658)
@@ -1,125 +1,125 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
 	model = "Ralink MT7620a + MT7610e evaluation board";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		s2 {
 			label = "S2";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x100>;
 		};
 
 		s3 {
 			label = "S3";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x101>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 	mediatek,portmap = "llllw";
 
 	port@4 {
 		status = "okay";
 		phy-mode = "rgmii";
 		phy-handle = <&phy4>;
 	};
 
 	port@5 {
 		status = "okay";
 		phy-mode = "rgmii";
 		phy-handle = <&phy5>;
 	};
 
 	mdio-bus {
 		status = "okay";
 
 		phy4: ethernet-phy@4 {
 			reg = <4>;
 			phy-mode = "rgmii";
 		};
 
 		phy5: ethernet-phy@5 {
 			reg = <5>;
 			phy-mode = "rgmii";
 		};
 	};
 };
 
 &gsw {
 	mediatek,port4 = "gmac";
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &pcie {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MT7620a_MT7530.dts
===================================================================
--- head/sys/gnu/dts/mips/MT7620a_MT7530.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MT7620a_MT7530.dts	(revision 300658)
@@ -1,117 +1,117 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
 	model = "Ralink MT7620a + MT7530 evaluation board";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 	mediatek,portmap = "llllw";
 
 	port@5 {
 		status = "okay";
 		mediatek,fixed-link = <1000 1 1 1>;
 		phy-mode = "rgmii";
 	};
 
 	mdio-bus {
 		status = "okay";
 
 		phy0: ethernet-phy@0 {
 			reg = <0>;
 			phy-mode = "rgmii";
 		};
 
 		phy1: ethernet-phy@1 {
 			reg = <1>;
 			phy-mode = "rgmii";
 		};
 
 		phy2: ethernet-phy@2 {
 			reg = <2>;
 			phy-mode = "rgmii";
 		};
 
 		phy3: ethernet-phy@3 {
 			reg = <3>;
 			phy-mode = "rgmii";
 		};
 
 		phy4: ethernet-phy@4 {
 			reg = <4>;
 			phy-mode = "rgmii";
 		};
 
 		phy1f: ethernet-phy@1f {
 			reg = <0x1f>;
 			phy-mode = "rgmii";
 		};
 	};
 };
 
 &gsw {
 	mediatek,port4 = "gmac";
 	mediatek,mt7530 = <1>;
 };
 
 &pcie {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MT7620a_MT7610e.dts
===================================================================
--- head/sys/gnu/dts/mips/MT7620a_MT7610e.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MT7620a_MT7610e.dts	(revision 300658)
@@ -1,86 +1,86 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-eval-board", "ralink,mt7620a-soc";
 	model = "Ralink MT7620A evaluation board";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 12 1>;
 			linux,code = <0x100>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 13 1>;
 			linux,code = <0x101>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <1000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ethernet {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MT7628.dts
===================================================================
--- head/sys/gnu/dts/mips/MT7628.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MT7628.dts	(revision 300658)
@@ -1,67 +1,67 @@
 /dts-v1/;
 
 #include "mt7628an.dtsi"
 
 / {
 	compatible = "mediatek,mt7628an-eval-board", "mediatek,mt7628an-soc";
 	model = "Mediatek MT7628AN evaluation board";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x2000000>;
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &wmac {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &wmac {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/MZK-750DHP.dts
===================================================================
--- head/sys/gnu/dts/mips/MZK-750DHP.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MZK-750DHP.dts	(revision 300658)
@@ -1,127 +1,127 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Planex MZK-750DHP";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wps {
 			label = "mzk-750dhp:green:wps";
 			gpios = <&gpio2 15 1>;
 		};
 
 		power {
 			label = "mzk-750dhp:green:power";
 			gpios = <&gpio1 15 1>;
 		};
 
 		wlan5g {
 			label = "mzk-750dhp:green:wlan5g";
 			gpios = <&gpio1 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		s1 {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		s2 {
 			label = "wps";
 			gpios = <&gpio2 19 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "spi refclk", "rgmii1", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/MZK-DP150N.dts
===================================================================
--- head/sys/gnu/dts/mips/MZK-DP150N.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MZK-DP150N.dts	(revision 300658)
@@ -1,98 +1,100 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "MZK-DP150N", "ralink,rt5350-soc";
 	model = "Planex MZK-DP150N";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "mzk-dp150n:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "uboot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
+};
 
-	spidev@1 {
+&spi1 {
+	spidev@0 {
 		compatible = "linux,spidev";
 		spi-max-frequency = <10000000>;
-		reg = <1 0>;
+		reg = <0>;
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag", "uartf", "led";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x17>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 	ralink,led-polarity = <1>;
 };
Index: head/sys/gnu/dts/mips/MZK-EX300NP.dts
===================================================================
--- head/sys/gnu/dts/mips/MZK-EX300NP.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MZK-EX300NP.dts	(revision 300658)
@@ -1,130 +1,130 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Planex MZK-EX300NP";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wifi {
 			label = "mzk-ex300np:green:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 		wps {
 			label = "mzk-ex300np:green:wps";
 			gpios = <&gpio1 5 1>;
 		};
 
 		rep {
 			label = "mzk-ex300np:blue:rep";
 			gpios = <&gpio1 4 1>;
 		};
 
 		wifi1 {
 			label = "mzk-ex300np:blue:wifi1";
 			gpios = <&gpio1 1 1>;
 		};
 
 		wifi2 {
 			label = "mzk-ex300np:blue:wifi2";
 			gpios = <&gpio1 2 1>;
 		};
 
 		wifi3 {
 			label = "mzk-ex300np:blue:wifi3";
 			gpios = <&gpio1 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio1 3 0>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x730000>;
 		};
 
 		partition@780000 {
 			label = "Udata";
 			reg = <0x780000 0x80000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "spi refclk", "rgmii1", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/MZK-EX750NP.dts
===================================================================
--- head/sys/gnu/dts/mips/MZK-EX750NP.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MZK-EX750NP.dts	(revision 300658)
@@ -1,148 +1,148 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Planex MZK-EX750NP";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "mzk-ex750np:red:power";
 			gpios = <&gpio0 14 1>;
 		};
 
 		wifi {
 			label = "mzk-ex750np:red:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 		wps {
 			label = "mzk-ex750np:green:wps";
 			gpios = <&gpio0 10 1>;
 		};
 
 		rep {
 			label = "mzk-ex750np:blue:rep";
 			gpios = <&gpio2 16 1>;
 		};
 
 		wifi1 {
 			label = "mzk-ex750np:blue:wifi1";
 			gpios = <&gpio2 19 1>;
 		};
 
 		wifi2 {
 			label = "mzk-ex750np:blue:wifi2";
 			gpios = <&gpio2 18 1>;
 		};
 
 		wifi3 {
 			label = "mzk-ex750np:blue:wifi3";
 			gpios = <&gpio2 17 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 9 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 13 0>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x730000>;
 		};
 
 		partition@780000 {
 			label = "Udata";
 			reg = <0x780000 0x80000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uartf", "nd_sd", "rgmii2", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/MicroWRT.dts
===================================================================
--- head/sys/gnu/dts/mips/MicroWRT.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/MicroWRT.dts	(revision 300658)
@@ -1,107 +1,107 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "microwrt", "ralink,mt7620a-soc";
 	model = "Microduino MicroWRT";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x20000>;
 			read-only;
 		};
 
 		partition@20000 {
 			label = "u-boot-env";
 			reg = <0x20000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@30000 {
 			label = "factory";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "firmware";
 			reg = <0x40000 0xfc0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &pcie {
 	status = "okay";
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "wled", "i2c", "wdt", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/NCS601W.dts
===================================================================
--- head/sys/gnu/dts/mips/NCS601W.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/NCS601W.dts	(revision 300658)
@@ -1,73 +1,73 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "NCS601W", "ralink,rt5350-soc";
 	model = "Wansview NCS601W";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/NW718.dts
===================================================================
--- head/sys/gnu/dts/mips/NW718.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/NW718.dts	(revision 300658)
@@ -1,107 +1,107 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "NW718", "ralink,rt3050-soc";
 	model = "Netcore NW718";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		cpu {
 			label = "nw718:amber:cpu";
 			gpios = <&gpio0 13 1>;
 		};
 
 		usb {
 			label = "nw718:amber:usb";
 			gpios = <&gpio0 8 1>;
 		};
 
 		wps {
 			label = "nw718:amber:wps";
 			gpios = <&gpio0 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <25000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "config";
 			reg = <0x30000 0x20000>;
 			read-only;
 		};
 
 		factory: partition@50000 {
 			label = "factory";
 			reg = <0x50000 0x10000>;
 			read-only;
 		};
 
 		partition@60000 {
 			label = "firmware";
 			reg = <0x60000 0x3a0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &otg {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/OY-0001.dts
===================================================================
--- head/sys/gnu/dts/mips/OY-0001.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/OY-0001.dts	(revision 300658)
@@ -1,122 +1,122 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "OY-0001";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		powerled {
 			label = "oy-0001:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifiled {
 			label = "oy-0001:green:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		s1 {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/PBR-M1.dts
===================================================================
--- head/sys/gnu/dts/mips/PBR-M1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/PBR-M1.dts	(revision 300658)
@@ -1,188 +1,188 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "PBR-M1";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x10000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	palmbus: palmbus@1E000000 {
 		i2c: i2c@900 {
 			compatible = "ralink,i2c-mt7621";
 			reg = <0x900 0x100>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c_pins>;
 			status = "okay";
 
 			pcf8563: rtc@51 {
 				status = "okay";
 				compatible = "nxp,pcf8563";
 				reg = <0x51>;
 			};
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "pbr-m1:blue:power";
 			gpios = <&gpio0 31 1>;
 		};
 
 		sys {
 			label = "pbr-m1:blue:sys";
 			gpios = <&gpio1 0 1>;
 		};
 
 		internet {
 			label = "pbr-m1:blue:internet";
 			gpios = <&gpio0 29 1>;
 		};
 
 		wlan2g {
 			label = "pbr-m1:blue:wlan2g";
 			gpios = <&gpio1 1 1>;
 		};
 
 		wlan5g {
 			label = "pbr-m1:blue:wlan5g";
 			gpios = <&gpio0 28 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		power_usb2 {
 			gpio-export,name = "power_usb2";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 22 0>;
 		};
 
 		power_usb3 {
 			gpio-export,name = "power_usb3";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 25 0>;
 		};
 
 		power_sata {
 			gpio-export,name = "power_sata";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 27 0>;
 		};
 	};
 
 	beeper: beeper {
 		compatible = "gpio-beeper";
 		gpios = <&gpio0 26 1>;
 	};
 };
 
 &sdhci {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&sdhci_pins>;
 };
 
 &xhci {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
 
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/PSG1208.dts
===================================================================
--- head/sys/gnu/dts/mips/PSG1208.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/PSG1208.dts	(revision 300658)
@@ -1,112 +1,112 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "PSG1208", "ralink,mt7620a-soc";
 	model = "Phicomm PSG1208";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wan {
 			label = "psg1208:white:wps";
 			gpios = <&gpio1 15 1>;
 		};
 
 		wlan {
 			label = "psg1208:white:wlan2g";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@20000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@30000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/PX-4885-4M.dts
===================================================================
--- head/sys/gnu/dts/mips/PX-4885-4M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/PX-4885-4M.dts	(revision 300658)
@@ -1,39 +1,39 @@
 /dts-v1/;
 
 #include "PX-4885.dtsi"
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x20000>;
 			read-only;
 		};
 
 		partition@20000 {
 			label = "devdata";
 			reg = <0x20000 0x20000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "devconf";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/PX-4885-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/PX-4885-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/PX-4885-8M.dts	(revision 300658)
@@ -1,39 +1,39 @@
 /dts-v1/;
 
 #include "PX-4885.dtsi"
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x20000>;
 			read-only;
 		};
 
 		partition@20000 {
 			label = "devdata";
 			reg = <0x20000 0x20000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "devconf";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/PX-4885.dtsi
===================================================================
--- head/sys/gnu/dts/mips/PX-4885.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/PX-4885.dtsi	(revision 300658)
@@ -1,54 +1,54 @@
 #include "rt5350.dtsi"
 
 / {
 	compatible = "PX-4885", "ralink,rt5350-soc";
 	model = "7Links PX-4885";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		orange {
 			label = "px-4885:orange:wifi";
 			gpios = <&gpio0 18 1>;
 		};
 
 		blue {
 			label = "px-4885:blue:storage";
 			gpios = <&gpio0 19 1>;
 		};
 	};
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x3f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/RE6500.dts
===================================================================
--- head/sys/gnu/dts/mips/RE6500.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RE6500.dts	(revision 300658)
@@ -1,121 +1,121 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "Linksys RE6500";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x4000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wifi {
 			label = "re6500:orange:wifi";
 			gpios = <&gpio0 0 0>;
 		};
 
 		power {
 			label = "re6500:white:power";
 			gpios = <&gpio0 9 0>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x211>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 11 0>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uart2", "uart3", "rgmii2";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x2e>;
 };
Index: head/sys/gnu/dts/mips/RP-N53.dts
===================================================================
--- head/sys/gnu/dts/mips/RP-N53.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RP-N53.dts	(revision 300658)
@@ -1,164 +1,164 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "asus,rp-n53", "ralink,mt7620a-soc";
 	model = "Asus RP-N53";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		touch {
 			label = "touch";
 			gpios = <&gpio1 0 1>;
 			linux,code = <0x100>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio1 1 1>;
 			linux,code = <0x100>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio1 2 1>;
 			linux,code = <0x100>;
 		};
 
 		audio {
 			label = "audio";
 			gpios = <&gpio1 3 0>;
 			linux,code = <0x101>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		backlight {
 			label = "rp-n53:white:back";
 			gpios = <&gpio1 4 1>;
 		};
 
 		wifi0 {
 			label = "rp-n53:blue:5g3";
 			gpios = <&gpio1 5 1>;
 		};
 
 		wifi1 {
 			label = "rp-n53:blue:5g2";
 			gpios = <&gpio1 6 1>;
 		};
 
 		wifi2 {
 			label = "rp-n53:blue:5g1";
 			gpios = <&gpio1 7 1>;
 		};
 
 		wifi3 {
 			label = "rp-n53:blue:wifi";
 			gpios = <&gpio1 8 1>;
 		};
 
 		wifi4 {
 			label = "rp-n53:blue:2g1";
 			gpios = <&gpio1 9 1>;
 		};
 
 		wifi5 {
 			label = "rp-n53:blue:2g2";
 			gpios = <&gpio1 10 1>;
 		};
 
 		wifi6 {
 			label = "rp-n53:blue:2g3";
 			gpios = <&gpio1 11 1>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &i2c {
 	status = "okay";
 };
 
 &i2s {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pcm_i2s_pins>;
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pcm {
 	status = "okay";
 };
 
 &gdma {
 	status = "okay";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "mdio", "rgmii1";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/RT-G32-B1.dts
===================================================================
--- head/sys/gnu/dts/mips/RT-G32-B1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RT-G32-B1.dts	(revision 300658)
@@ -1,84 +1,84 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "RT-G32-B1", "ralink,rt3050-soc";
 	model = "Asus RT-G32 B1";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "devdata";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		devconf: partition@40000 {
 			label = "devconf";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&devconf 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&devconf 0>;
 };
Index: head/sys/gnu/dts/mips/RT-N14U.dts
===================================================================
--- head/sys/gnu/dts/mips/RT-N14U.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RT-N14U.dts	(revision 300658)
@@ -1,126 +1,126 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "asus,rt-n14u", "ralink,mt7620n-soc";
 	model = "Asus RT-N14U";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wan {
 			label = "rt-n14u:blue:wan";
 			gpios = <&gpio2 0 1>;
 		};
 
 		lan {
 			label = "rt-n14u:blue:lan";
 			gpios = <&gpio2 1 1>;
 		};
 
 		usb {
 			label = "rt-n14u:blue:usb";
 			gpios = <&gpio2 2 1>;
 		};
 
 		power {
 			label = "rt-n14u:blue:power";
 			gpios = <&gpio2 3 1>;
 		};
 
 		air {
 			label = "rt-n14u:blue:air";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "ephy", "wled", "i2c";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts
===================================================================
--- head/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts	(revision 300658)
@@ -1,100 +1,100 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "RT5350F-OLINUXINO-EVB", "ralink,rt5350-soc";
 	model = "Olimex RT5350F-OLinuXino-EVB";
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		relay1 {
 			gpio-export,name = "relay1";
 			gpio-export,output = <0>;
 			gpios = <&gpio0 14 0>;
 		};
 
 		relay2 {
 			gpio-export,name = "relay2";
 			gpio-export,output = <0>;
 			gpios = <&gpio0 12 0>;
 		};
 
 		button {
 			gpio-export,name = "button";
 			gpios = <&gpio0 0 1>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <0x17>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts
===================================================================
--- head/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts	(revision 300658)
@@ -1,78 +1,78 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "RT5350F-OLINUXINO", "ralink,rt5350-soc";
 	model = "Olimex RT5350F-OLinuXino";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <0x17>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/RUT5XX.dts
===================================================================
--- head/sys/gnu/dts/mips/RUT5XX.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/RUT5XX.dts	(revision 300658)
@@ -1,91 +1,91 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "RUT5XX", "ralink,rt3050-soc";
 	model = "Teltonika RUT5XX";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "rut5xx:green:status";
 			gpios = <&gpio0 14 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "n25q128a13";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &esw {
 	mediatek,portmap = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &otg {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/SAP-G3200U3.dts
===================================================================
--- head/sys/gnu/dts/mips/SAP-G3200U3.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/SAP-G3200U3.dts	(revision 300658)
@@ -1,122 +1,122 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "STORYLiNK SAP-G3200U3";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		usb {
 			label = "sap-g3200u3:green:usb";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 16 1>;
 			linux,code = <0x198>;
 		};
 
 		rfkill {
 			label = "rfkill";
 			gpios = <&gpio0 14 1>;
 			linux,code = <0xf7>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x1000>;
 			read-only;
 		};
 
 		partition@31000 {
 			label = "config";
 			reg = <0x31000 0xf000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe006>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uart3", "jtag";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/SK-WB8.dts
===================================================================
--- head/sys/gnu/dts/mips/SK-WB8.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/SK-WB8.dts	(revision 300658)
@@ -1,124 +1,124 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "SamKnows Whitebox 8";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wps {
 			label = "sk-wb8:green:wps";
 			gpios = <&gpio1 14 1>;
 		};
 
 		usb {
 			label = "sk-wb8:green:usb";
 			gpios = <&gpio1 15 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		wps {
 			label = "wps";
 			gpios = <&gpio1 11 1>;
 			linux,code = <0x211>;
 		};
 		reset {
 			label = "reset";
 			gpios = <&gpio1 9 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 
 		partition@e30000 {
 			label = "recovery";
 			reg = <0xe30000 0x1d0000>;
 		};
 
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/TINY-AC.dts
===================================================================
--- head/sys/gnu/dts/mips/TINY-AC.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/TINY-AC.dts	(revision 300658)
@@ -1,163 +1,163 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "TINY-AC", "ralink,mt7620a-soc";
 	model = "Dovado Tiny AC";
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		usb {
 			label = "tiny-ac:green:usb";
 			gpios = <&gpio0 11 1>;
 		};
 
 		wifi {
 			label = "tiny-ac:orange:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 13 1>;
 			linux,code = <0x198>;
 		};
 
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usbpower {
 			gpio-export,name = "usbpower";
 			gpio-export,output = <1>;
 			gpios = <&gpio2 5 0>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins &rgmii2_pins &mdio_pins>;
 	mediatek,portmap = "llllw";
 
 	port@4 {
 		status = "okay";
 		phy-mode = "rgmii";
 		phy-handle = <&phy4>;
 	};
 
 	port@5 {
 		status = "okay";
 		phy-mode = "rgmii";
 		phy-handle = <&phy5>;
 	};
 
 	mdio-bus {
 		status = "okay";
 
 		phy4: ethernet-phy@4 {
 			reg = <4>;
 			phy-mode = "rgmii";
 		};
 
 		phy5: ethernet-phy@5 {
 			reg = <5>;
 			phy-mode = "rgmii";
 		};
 	};
 };
 
 &gsw {
 	mediatek,port4 = "gmac";
 	mediatek,mt7530 = <1>;
 };
 
 &wmac {
 	ralink,eeprom = "rt2x00pci_1_0.eeprom";
 };
 
 &pcie {
 	status = "okay";
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uartf", "nd_sd", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/VOCORE-16M.dts
===================================================================
--- head/sys/gnu/dts/mips/VOCORE-16M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/VOCORE-16M.dts	(revision 300658)
@@ -1,39 +1,39 @@
 /dts-v1/;
 
 #include "VOCORE.dtsi"
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "uboot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/VOCORE-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/VOCORE-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/VOCORE-8M.dts	(revision 300658)
@@ -1,39 +1,39 @@
 /dts-v1/;
 
 #include "VOCORE.dtsi"
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "uboot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/VOCORE.dtsi
===================================================================
--- head/sys/gnu/dts/mips/VOCORE.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/VOCORE.dtsi	(revision 300658)
@@ -1,196 +1,196 @@
 #include "rt5350.dtsi"
 
 / {
 	compatible = "VoCore", "ralink,rt5350-soc";
 	model = "VoCore";
 
 	gpio-export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		gpio0 {
 			gpio-export,name = "gpio0";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 0 0>;
 		};
 
 		/* UARTF */
 		gpio7 {
 			/* UARTF_RTS_N */
 			gpio-export,name = "gpio7";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 7 0>;
 		};
 
 		gpio8 {
 			/* UARTF_TXD */
 			gpio-export,name = "gpio8";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 8 0>;
 		};
 
 		gpio9 {
 			/* UARTF_CTS_N */
 			gpio-export,name = "gpio9";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 9 0>;
 		};
 
 		gpio12 {
 			/* UARTF_DCD_N */
 			gpio-export,name = "gpio12";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 12 0>;
 		};
 
 		gpio13 {
 			/* UARTF_DSR_N */
 			gpio-export,name = "gpio13";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 13 0>;
 		};
 
 		gpio14 {
 			/* UARTF_RIN */
 			gpio-export,name = "gpio14";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 14 0>;
 		};
 
 		/* JTAG */
 		gpio17 {
 			/* JTAG_TDO */
 			gpio-export,name = "gpio17";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 17 0>;
 		};
 
 		gpio18 {
 			/* JTAG_TDI */
 			gpio-export,name = "gpio18";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 18 0>;
 		};
 
 		gpio19 {
 			/* JTAG_TMS */
 			gpio-export,name = "gpio19";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 19 0>;
 		};
 
 		gpio20 {
 			/* JTAG_TCLK */
 			gpio-export,name = "gpio20";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 20 0>;
 		};
 
 		gpio21 {
 			/* JTAG_TRST_N */
 			gpio-export,name = "gpio21";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio0 21 0>;
 		};
 
 		/* ETH LEDs */
 		gpio22 {
 			/* ETH0_LED */
 			gpio-export,name = "gpio22";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio1 0 0>;
 		};
 
 		gpio23 {
 			/* ETH1_LED */
 			gpio-export,name = "gpio23";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio1 1 0>;
 		};
 
 		gpio24 {
 			/* ETH2_LED */
 			gpio-export,name = "gpio24";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio1 2 0>;
 		};
 
 		gpio25 {
 			/* ETH3_LED */
 			gpio-export,name = "gpio25";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio1 3 0>;
 		};
 
 		gpio26 {
 			/* ETH4_LED */
 			gpio-export,name = "gpio26";
 			gpio-export,direction_may_change = <1>;
 			gpios = <&gpio1 4 0>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			/* UARTF_RXD */
 			label = "vocore:green:status";
 			gpios = <&gpio0 10 0>;
 		};
 
 		eth {
 			/* UARTF_DTR_N */
 			label = "vocore:orange:eth";
 			gpios = <&gpio0 11 0>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &i2c {
 	status = "okay";
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag", "uartf", "led";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x11>;
 	mediatek,portdisable = <0x2e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &spi1 {
 	status = "okay";
 
 	spidev@0 {
 		compatible = "linux,spidev";
 		spi-max-frequency = <10000000>;
 		reg = <0>;
 	};
 };
Index: head/sys/gnu/dts/mips/WHR-1166D.dts
===================================================================
--- head/sys/gnu/dts/mips/WHR-1166D.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WHR-1166D.dts	(revision 300658)
@@ -1,170 +1,170 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Buffalo WHR-1166D";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "whr-1166d:red:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
 			label = "whr-1166d:green:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
 			label = "whr-1166d:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi2 {
 			label = "whr-1166d:orange:wifi";
 			gpios = <&gpio0 10 1>;
 		};
 
 		internet {
 			label = "whr-1166d:green:internet";
 			gpios = <&gpio2 17 1>;
 		};
 
 		router {
 			label = "whr-1166d:orange:router";
 			gpios = <&gpio2 18 1>;
 		};
 
 		router2 {
 			label = "whr-1166d:green:router";
 			gpios = <&gpio2 19 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio2 12 1>;
 			linux,code = <0x198>;
 		};
 
 		aoss {
 			label = "aoss";
 			gpios = <&gpio2 13 1>;
 			linux,code = <0x211>;
 		};
 
 		ap {
 			label = "ap";
 			gpios = <&gpio2 14 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		bridge {
 			label = "bridge";
 			gpios = <&gpio2 15 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii1_pins &mdio_pins>;
 
 	port@5 {
 		status = "okay";
 		phy-handle = <&phy5>;
 		phy-mode = "rgmii";
 	};
 
 	mdio-bus {
 		status = "okay";
 
 		phy5: ethernet-phy@5 {
 			reg = <5>;
 			phy-mode = "rgmii";
 		};
 	};
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 32768>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WHR-300HP2.dts
===================================================================
--- head/sys/gnu/dts/mips/WHR-300HP2.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WHR-300HP2.dts	(revision 300658)
@@ -1,148 +1,148 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Buffalo WHR-300HP2";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "whr-300hp2:red:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
 			label = "whr-300hp2:green:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
 			label = "whr-300hp2:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi2 {
 			label = "whr-300hp2:orange:wifi";
 			gpios = <&gpio0 10 1>;
 		};
 
 		internet {
 			label = "whr-300hp2:green:internet";
 			gpios = <&gpio2 17 1>;
 		};
 
 		router {
 			label = "whr-300hp2:green:router";
 			gpios = <&gpio2 18 1>;
 		};
 
 		router2 {
 			label = "whr-300hp2:orange:router";
 			gpios = <&gpio2 19 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio2 12 1>;
 			linux,code = <0x198>;
 		};
 
 		aoss {
 			label = "aoss";
 			gpios = <&gpio2 13 1>;
 			linux,code = <0x211>;
 		};
 
 		ap {
 			label = "ap";
 			gpios = <&gpio2 14 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		bridge {
 			label = "bridge";
 			gpios = <&gpio2 15 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 
 		pa {
 			ralink,group = "pa";
 			ralink,function = "pa";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/WHR-600D.dts
===================================================================
--- head/sys/gnu/dts/mips/WHR-600D.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WHR-600D.dts	(revision 300658)
@@ -1,148 +1,148 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ralink,mt7620a-soc";
 	model = "Buffalo WHR-600D";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "whr-600d:red:power";
 			gpios = <&gpio0 7 1>;
 		};
 
 		wifi {
 			label = "whr-600d:green:wifi";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power2 {
 			label = "whr-600d:green:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wifi2 {
 			label = "whr-600d:orange:wifi";
 			gpios = <&gpio0 10 1>;
 		};
 
 		internet {
 			label = "whr-600d:green:internet";
 			gpios = <&gpio2 17 1>;
 		};
 
 		router {
 			label = "whr-600d:green:router";
 			gpios = <&gpio2 18 1>;
 		};
 
 		router2 {
 			label = "whr-600d:orange:router";
 			gpios = <&gpio2 19 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio2 12 1>;
 			linux,code = <0x198>;
 		};
 
 		aoss {
 			label = "aoss";
 			gpios = <&gpio2 13 1>;
 			linux,code = <0x211>;
 		};
 
 		ap {
 			label = "ap";
 			gpios = <&gpio2 14 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		bridge {
 			label = "bridge";
 			gpios = <&gpio2 15 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &gsw {
 	mediatek,port4 = "ephy";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/WITI.dts
===================================================================
--- head/sys/gnu/dts/mips/WITI.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WITI.dts	(revision 300658)
@@ -1,129 +1,129 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "MQmaker WiTi";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x10000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	palmbus: palmbus@1E000000 {
 		i2c@900 {
 			compatible = "ralink,i2c-mt7621";
 			reg = <0x900 0x100>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c_pins>;
 			status = "okay";
 
 			pcf8563: rtc@51 {
 				status = "okay";
 				compatible = "nxp,pcf8563";
 				reg = <0x51>;
 			};
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 
 &sdhci {
 	status = "okay";
 };
 
 &xhci {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 			mtd-mac-address = <&factory 0xe000>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 			mtd-mac-address = <&factory 0xe000>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wdt", "rgmii2", "jtag", "mdio";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WIZARD8800.dts
===================================================================
--- head/sys/gnu/dts/mips/WIZARD8800.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WIZARD8800.dts	(revision 300658)
@@ -1,81 +1,81 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "WIZARD8800", "ralink,rt5350-soc";
 	model = "EASYACC WI-STOR WIZARD 8800";
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q32";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/WIZFI630A.dts
===================================================================
--- head/sys/gnu/dts/mips/WIZFI630A.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WIZFI630A.dts	(revision 300658)
@@ -1,184 +1,184 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "wizfi630a", "ralink,rt5350-soc";
 	model = "WIZnet WizFi630A";
 
 	chosen {
 		bootargs = "console=ttyS1,115200";
 	};
 
 	gpio-export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		run {
 			label = "wizfi630a::run";
 			gpios = <&gpio0 1 1>;
 		};
 
 		wps {
 			label = "wizfi630a::wps";
 			gpios = <&gpio0 20 1>;
 		};
 
 		uart1 {
 			label = "wizfi630a::uart1";
 			gpios = <&gpio0 18 1>;
 		};
 
 		uart2 {
 			label = "wizfi630a::uart2";
 			gpios = <&gpio0 21 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 17 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 		
 		scm1 {
 			label = "SCM1";
 			gpios = <&gpio0 19 1>;
 			linux,code = <0x100>;
 		};
 
 		scm2 {
 			label = "SCM2";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x101>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			#size-cells = <1>;
 			label = "uboot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			#size-cells = <1>;
 			label = "uboot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			#size-cells = <1>;
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			#size-cells = <1>;
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &uart {
 	compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
 	reg = <0x500 0x100>;
 	resets = <&rstctrl 12>;
 	reset-names = "uart";
 	interrupt-parent = <&intc>;
 	interrupts = <5>;
 	reg-shift = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&uartf_pins>;
 	status = "okay";
 };
 
 &uartlite {
 	compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
 	reg = <0xc00 0x100>;
 	resets = <&rstctrl 19>;
 	reset-names = "uartl";
 	interrupt-parent = <&intc>;
 	interrupts = <12>;
 	reg-shift = <2>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&uartlite_pins>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag" ;
 			ralink,function = "gpio";
 		};
 	};
 
 	uartf_gpio_pins: uartf_gpio {
 		uartf_gpio {
 			ralink,group = "uartf";
 			ralink,function = "uartf";
 		};
 	};
 
 	uartlite_pins: uartlite {
 		uart {
 			ralink,group = "uartlite";
 			ralink,function = "uartlite";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x17>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/WL-330N.dts
===================================================================
--- head/sys/gnu/dts/mips/WL-330N.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WL-330N.dts	(revision 300658)
@@ -1,98 +1,98 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "WL-330N", "ralink,rt3050-soc";
 	model = "Asus WL-330N";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		link {
 			label = "wl-330n:blue:link";
 			gpios = <&gpio0 9 1>;
 		};
 
 		power {
 			label = "wl-330n:blue:power";
 			gpios = <&gpio0 11 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/WL-330N3G.dts
===================================================================
--- head/sys/gnu/dts/mips/WL-330N3G.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WL-330N3G.dts	(revision 300658)
@@ -1,107 +1,107 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "WL-330N3G", "ralink,rt3050-soc";
 	model = "Asus WL-330N3G";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		3g {
 			label = "wl-330n3g:blue:3g";
 			gpios = <&gpio0 9 1>;
 		};
 
 		3g2 {
 			label = "wl-330n3g:red:3g";
 			gpios = <&gpio0 13 1>;
 		};
 
 		power {
 			label = "wl-330n3g:blue:power";
 			gpios = <&gpio0 11 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x3e>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &otg {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/WMR-300.dts
===================================================================
--- head/sys/gnu/dts/mips/WMR-300.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WMR-300.dts	(revision 300658)
@@ -1,104 +1,104 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "buffalo,wmr-300", "ralink,mt7620n-soc";
 	model = "Buffalo WMR-300";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		aoss1 {
 			label = "wmr-300:red:aoss";
 			gpios = <&gpio2 1 1>;
 		};
 
 		aoss2 {
 			label = "wmr-300:green:aoss";
 			gpios = <&gpio2 2 1>;
 		};
 
 		power {
 			label = "wmr-300:green:status";
 			gpios = <&gpio2 4 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		aoss {
 			label = "aoss";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "ephy";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WNCE2001.dts
===================================================================
--- head/sys/gnu/dts/mips/WNCE2001.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WNCE2001.dts	(revision 300658)
@@ -1,137 +1,137 @@
 /dts-v1/;
 
 #include "rt3050.dtsi"
 
 / {
 	compatible = "WNCE2001", "ralink,rt3052-soc";
 	model = "Netgear WNCE2001";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power-green {
 			label = "wnce2001:green:power";
 			gpios = <&gpio0 8 1>;
 		};
 
 		power-red {
 			label = "wnce2001:red:power";
 			gpios = <&gpio0 9 1>;
 		};
 
 		wlan-green {
 			label = "wnce2001:green:wlan";
 			gpios = <&gpio0 12 0>;
 		};
 
 		wlan-red {
 			label = "wnce2001:red:wlan";
 			gpios = <&gpio0 13 0>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 0 1>;
 			linux,code = <0x211>;
 		};
 
 		rt {
 			label = "rt";
 			gpios = <&gpio0 11 1>;
 			linux,code = <0x100>;
 		};
 
 		ap {
 			label = "ap";
 			gpios = <&gpio0 7 1>;
 			linux,code = <0x101>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		factory: partition@30000 {
 			label = "factory";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		partition@40000 {
 			label = "config";
 			reg = <0x40000 0x20000>;
 			read-only;
 		};
 
 		partition@60000 {
 			label = "language";
 			reg = <0x60000 0x30000>;
 			read-only;
 		};
 
 		partition@90000 {
 			label = "pot";
 			reg = <0x90000 0x10000>;
 			read-only;
 		};
 
 		partition@a0000 {
 			label = "checksum";
 			reg = <0xa0000 0x10000>;
 		};
 
 		partition@b0000 {
 			label = "firmware";
 			reg = <0xb0000 0x350000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x28>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
Index: head/sys/gnu/dts/mips/WNDR3700V5.dts
===================================================================
--- head/sys/gnu/dts/mips/WNDR3700V5.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WNDR3700V5.dts	(revision 300658)
@@ -1,137 +1,137 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board","ralink,mt7621-soc";
 	model = "Netgear WNDR3700v5";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600 maxcpus=2";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		wps {
 			label = "wndr3700v5:green:wps";
 			gpios = <&gpio0 12 1>;
 		};
 
 		power {
 			label = "wndr3700v5:green:power";
 			gpios = <&gpio0 18 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		wps {
 			label = "wndr3700v5:wps";
 			gpios = <&gpio0 7 0>;
 			linux,code = <0x211>;
 		};
 
 		wifi {
 			label = "wndr3700v5:wifi";
 			gpios = <&gpio0 8 0>;
 			linux,code = <0xf7>;
 		};
 
 		reset {
 			label = "wndr3700v5:reset";
 			gpios = <&gpio0 14 0>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usbpower {
 			gpio-export,name = "usbpower";
 			gpio-export,output = <1>;
 			gpios = <&gpio0 10 1>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "mx25l12805d";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@f30000 {
 			label = "factory";
 			reg = <0xf30000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0004>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie2 {
 		mt76@2,0 {
 			reg = <0x1000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8004>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x0000000c>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group =  "rgmii2", "mdio", "wdt";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WRH-300CR.dts
===================================================================
--- head/sys/gnu/dts/mips/WRH-300CR.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WRH-300CR.dts	(revision 300658)
@@ -1,125 +1,125 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "elecom,wrh-300cr", "ralink,mt7620n-soc";
 	model = "ELECOM WRH-300CR";
 
 		gpio-leds {
 		compatible = "gpio-leds";
 
 		wps {
 			label = "wrh-300cr:green:wps";
 			gpios = <&gpio2 0 1>;
 		};
 
 		ethernet {
 			label = "wrh-300cr:green:ethernet";
 			gpios = <&gpio2 3 1>;
 		};
 
 		wlan {
 			label = "wrh-300cr:green:wlan";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 
 		wps {
 			label = "wps";
 			gpios = <&gpio0 2 1>;
 			linux,code = <0x211>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l12805d";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "recover";
 			reg = <0x50000 0x1c0000>;
 			read-only;
 		};
 
 		partition@210000 {
 			label = "firmware";
 			reg = <0x210000 0xdf0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x2e>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "ephy", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WRTNODE.dts
===================================================================
--- head/sys/gnu/dts/mips/WRTNODE.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WRTNODE.dts	(revision 300658)
@@ -1,91 +1,91 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "wrtnode", "ralink,mt7620n-soc";
 	model = "WRTNODE";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		indicator {
 			label = "wrtnode:blue:indicator";
 			gpios = <&gpio1 14 1>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf", "spi refclk";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WRTNODE2.dtsi
===================================================================
--- head/sys/gnu/dts/mips/WRTNODE2.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/WRTNODE2.dtsi	(revision 300658)
@@ -1,90 +1,89 @@
 #include "mt7628an.dtsi"
 
 / {
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 5 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x1fb0000>;
 		};
 	};
 
 	spidev@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "spidev";
-		reg = <1 0>;
-		linux,modalias = "spidev", "spidev";
+		compatible = "linux,spidev";
+		reg = <1>;
 		spi-max-frequency = <10000000>;
 	};
 };
 
 &uart1 {
 	status = "okay";
 };
 
 &i2c {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	ralink,port-map = "llllw";
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &pcie {
 	status = "okay";
 };
 
 &wmac {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/WSR-1166.dts
===================================================================
--- head/sys/gnu/dts/mips/WSR-1166.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WSR-1166.dts	(revision 300658)
@@ -1,184 +1,184 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "Buffalo WSR-1166DHP";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x8000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		internet_g {
 			label = "wsr-1166:green:internet";
 			gpios = <&gpio1 9 1>;
 		};
 
 		router_g {
 			label = "wsr-1166:green:router";
 			gpios = <&gpio1 10 1>;
 		};
 
 		router_o {
 			label = "wsr-1166:orange:router";
 			gpios = <&gpio1 11 1>;
 		};
 
 		internet_o {
 			label = "wsr-1166:orange:internet";
 			gpios = <&gpio1 12 1>;
 		};
 
 		wifi_o {
 			label = "wsr-1166:orange:wifi";
 			gpios = <&gpio1 13 1>;
 		};
 
 		power {
 			label = "wsr-1166:green:power";
 			gpios = <&gpio1 14 1>;
 		};
 
 		diag {
 			label = "wsr-1166:orange:diag";
 			gpios = <&gpio1 15 1>;
 		};
 
 		wifi_g {
 			label = "wsr-1166:green:wifi";
 			gpios = <&gpio1 16 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		power {
 			label = "power";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x74>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 3 1>;
 			linux,code = <0x198>;
 		};
 
 		aoss {
 			label = "aoss";
 			gpios = <&gpio0 6 1>;
 			linux,code = <0x211>;
 		};
 
 		auto {
 			label = "mode";
 			gpios = <&gpio0 7 0>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		ap {
 			label = "ap";
 			gpios = <&gpio0 10 0>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		router {
 			label = "router";
 			gpios = <&gpio0 12 0>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 	};
 
 	gpio_poweroff {
 		compatible = "gpio-poweroff";
 		gpios = <&gpio0 0 1>;
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xf90000>;
 		};
 
 		partition@fe0000 {
 			label = "board_data";
 			reg = <0xfe0000 0x20000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WSR-600.dts
===================================================================
--- head/sys/gnu/dts/mips/WSR-600.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WSR-600.dts	(revision 300658)
@@ -1,157 +1,157 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "ralink,mt7621-eval-board", "ralink,mt7621-soc";
 	model = "Buffalo WSR-600DHP";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x4000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "wsr-600:green:power";
 			gpios = <&gpio0 12 1>;
 		};
 
 		wifi_o {
 			label = "wsr-600:orange:wifi";
 			gpios = <&gpio1 9 1>;
 		};
 
 		diag {
 			label = "wsr-600:orange:diag";
 			gpios = <&gpio1 10 1>;
 		};
 
 		wifi_g {
 			label = "wsr-600:green:wifi";
 			gpios = <&gpio1 12 1>;
 		};
 
 		router_o {
 			label = "wsr-600:orange:router";
 			gpios = <&gpio1 13 1>;
 		};
 
 		router_g {
 			label = "wsr-600:green:router";
 			gpios = <&gpio1 14 1>;
 		};
 
 		internet_o {
 			label = "wsr-600:orange:internet";
 			gpios = <&gpio1 15 1>;
 		};
 
 		internet_g {
 			label = "wsr-600:green:internet";
 			gpios = <&gpio1 16 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		power {
 			label = "power";
 			gpios = <&gpio0 8 1>;
 			linux,code = <0x74>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 11 1>;
 			linux,code = <0x198>;
 		};
 
 		aoss {
 			label = "aoss";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x211>;
 		};
 
 		auto {
 			label = "mode";
 			gpios = <&gpio0 7 0>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		ap {
 			label = "ap";
 			gpios = <&gpio0 6 0>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 
 		router {
 			label = "router";
 			gpios = <&gpio0 10 0>;
 			linux,code = <0x100>;
 			linux,input-type = <5>; /* EV_SW */
 		};
 	};
 
 	gpio_poweroff {
 		compatible = "gpio-poweroff";
 		gpios = <&gpio1 11 1>;
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WT1520-4M.dts
===================================================================
--- head/sys/gnu/dts/mips/WT1520-4M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WT1520-4M.dts	(revision 300658)
@@ -1,39 +1,39 @@
 /dts-v1/;
 
 #include "WT1520.dtsi"
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WT1520-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/WT1520-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WT1520-8M.dts	(revision 300658)
@@ -1,39 +1,39 @@
 /dts-v1/;
 
 #include "WT1520.dtsi"
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WT1520.dtsi
===================================================================
--- head/sys/gnu/dts/mips/WT1520.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/WT1520.dtsi	(revision 300658)
@@ -1,46 +1,46 @@
 #include "rt5350.dtsi"
 
 / {
 	compatible = "NEXXWT1520", "ralink,rt5350-soc";
 	model = "Nexx WT1520";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x2000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS1,57600";
 	};
 };
 
 &uart {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uartf_pins>;
 	status = "okay";
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/WT3020-4M.dts
===================================================================
--- head/sys/gnu/dts/mips/WT3020-4M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WT3020-4M.dts	(revision 300658)
@@ -1,100 +1,100 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "wt3020", "ralink,mt7620n-soc";
 	model = "Nexx WT3020";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "wt3020:blue:power";
 			gpios = <&gpio3 0 0>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q32";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x3b0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/WT3020-8M.dts
===================================================================
--- head/sys/gnu/dts/mips/WT3020-8M.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/WT3020-8M.dts	(revision 300658)
@@ -1,100 +1,100 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "wt3020", "ralink,mt7620n-soc";
 	model = "Nexx WT3020";
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "wt3020:blue:power";
 			gpios = <&gpio3 0 0>;
 		};
 	};
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "ephy", "wled", "pa", "i2c", "wdt", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/X5.dts
===================================================================
--- head/sys/gnu/dts/mips/X5.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/X5.dts	(revision 300658)
@@ -1,136 +1,136 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "X5", "ralink,rt5350-soc";
 	model = "Poray X5";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "x5:green:power";
 			gpios = <&gpio0 13 1>;
 		};
 
 		20 {
 			label = "x5:green:20";
 			gpios = <&gpio0 12 1>;
 		};
 
 		50 {
 			label = "x5:green:50";
 			gpios = <&gpio0 11 1>;
 		};
 
 		80 {
 			label = "x5:green:80";
 			gpios = <&gpio0 7 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		bat {
 			label = "bat";
 			gpios = <&gpio0 9 1>;
 			linux,code = <0x211>;
 		};
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 
 		mode {
 			label = "mode";
 			gpios = <&gpio0 14 1>;
 			linux,code = <0x100>;
 			linux,input-type = <5>;
 		};
 	};
 
 	gpio_export {
 		compatible = "gpio-export";
 		#size-cells = <0>;
 
 		usb-mode {
 			gpio-export,name = "usb-mode";
 			gpio-export,output = <0>;
 			gpios = <&gpio0 18 0>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "gd25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <1>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 	ralink,led-polarity = <1>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/X8.dts
===================================================================
--- head/sys/gnu/dts/mips/X8.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/X8.dts	(revision 300658)
@@ -1,97 +1,97 @@
 /dts-v1/;
 
 #include "rt5350.dtsi"
 
 / {
 	compatible = "X8", "ralink,rt5350-soc";
 	model = "Poray X8";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "x8:green:power";
 			gpios = <&gpio0 13 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 10 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "gd25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 };
 
 &esw {
 	mediatek,portmap = <0x2f>;
 	mediatek,led_polarity = <1>;
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 	ralink,led-polarity = <1>;
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/Y1.dtsi
===================================================================
--- head/sys/gnu/dts/mips/Y1.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/Y1.dtsi	(revision 300658)
@@ -1,107 +1,107 @@
 #include "mt7620a.dtsi"
 
 / {
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 11 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 	
 &gpio0 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &pcie {
 	status = "okay";
 
 	pcie-bridge {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 	
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uartf", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 
 		pa {
 			ralink,group = "pa";
 			ralink,function = "pa";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/YOUKU-YK1.dts
===================================================================
--- head/sys/gnu/dts/mips/YOUKU-YK1.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/YOUKU-YK1.dts	(revision 300658)
@@ -1,124 +1,124 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "YOUKU-YK1", "ralink,mt7620a-soc";
 	model = "YOUKU YK1";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 		wan {
 			label = "youku-yk1:blue:wan";
 			gpios = <&gpio2 4 1>;
 		};
 		air {
 			label = "youku-yk1:blue:air";
 			gpios = <&gpio3 0 1>;
 		};
 		usb {
 			label = "youku-yk1:blue:usb";
 			gpios = <&gpio1 11 1>;
 		};
 		power {
 			label = "youku-yk1:blue:power";
 			gpios = <&gpio1 5 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q256";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x1fb0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/ZBT-WA05.dts
===================================================================
--- head/sys/gnu/dts/mips/ZBT-WA05.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ZBT-WA05.dts	(revision 300658)
@@ -1,118 +1,118 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "zbtlink,zbt-wa05", "ralink,mt7620n-soc";
 	model = "Zbtlink ZBT-WA05";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		power {
 			label = "zbt-wa05:blue:power";
 			gpios = <&gpio1 14 1>;
 		};
 
 		usb {
 			label = "zbt-wa05:blue:usb";
 			gpios = <&gpio1 15 0>;
 		};
 
 		air {
 			label = "zbt-wa05:blue:air";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio2 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	en25q64@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x760000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "spi refclk", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/ZBT-WE826.dts
===================================================================
--- head/sys/gnu/dts/mips/ZBT-WE826.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ZBT-WE826.dts	(revision 300658)
@@ -1,122 +1,122 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "zbtlink,zbt-we826", "ralink,mt7620a-soc";
 	model = "ZBT-WE826";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 		power {
 			label = "zbt-we826:green:power";
 			gpios = <&gpio1 14 0>;
 		};
 		usb {
 			label = "zbt-we826:green:usb";
 			gpios = <&gpio1 15 0>;
 		};
 		air {
 			label = "zbt-we826:green:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	en25q128@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	ralink,port-map = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		default {
 			ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/ZBT-WG2626.dts
===================================================================
--- head/sys/gnu/dts/mips/ZBT-WG2626.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ZBT-WG2626.dts	(revision 300658)
@@ -1,126 +1,126 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "ZBT-WG2626";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	palmbus: palmbus@1E000000 {
 		i2c@900 {
 			compatible = "ralink,i2c-mt7621";
 			reg = <0x900 0x100>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c_pins>;
 			status = "okay";
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "zbt-wg2626:green:status";
 			gpios = <&gpio0 24 1>;
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wdt", "rgmii2", "wdt rst", "jtag", "mdio";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/ZBT-WG3526.dts
===================================================================
--- head/sys/gnu/dts/mips/ZBT-WG3526.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ZBT-WG3526.dts	(revision 300658)
@@ -1,126 +1,126 @@
 /dts-v1/;
 
 #include "mt7621.dtsi"
 
 / {
 	compatible = "mediatek,mt7621-eval-board", "mediatek,mt7621-soc";
 	model = "ZBT-WG3526";
 
 	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x1c000000>, <0x20000000 0x4000000>;
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,115200";
 	};
 
 	palmbus: palmbus@1E000000 {
 		i2c@900 {
 			compatible = "ralink,i2c-mt7621";
 			reg = <0x900 0x100>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c_pins>;
 			status = "okay";
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 18 1>;
 			linux,code = <0x198>;
 		};
 	};
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		status {
 			label = "zbt-wg3526:green:status";
 			gpios = <&gpio0 24 1>;
 		};
 	};
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0xfb0000>;
 		};
 	};
 };
 
 &pcie {
 	status = "okay";
 
 	pcie0 {
 		mt76@0,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x0000>;
 			mediatek,5ghz = <0>;
 		};
 	};
 
 	pcie1 {
 		mt76@1,0 {
 			reg = <0x0000 0 0 0 0>;
 			device_type = "pci";
 			mediatek,mtd-eeprom = <&factory 0x8000>;
 			mediatek,2ghz = <0>;
 		};
 	};
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0xe000>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "wdt", "rgmii2", "wdt rst", "jtag", "mdio";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/ZBT-WR8305RT.dts
===================================================================
--- head/sys/gnu/dts/mips/ZBT-WR8305RT.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ZBT-WR8305RT.dts	(revision 300658)
@@ -1,115 +1,115 @@
 /dts-v1/;
 
 #include "mt7620n.dtsi"
 
 / {
 	compatible = "zbtlink,zbt-wr8305rt", "ralink,mt7620n-soc";
 	model = "Zbtlink ZBT-WR8305RT";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		sys {
 			label = "zbt-wr8305rt:green:sys";
 			gpios = <&gpio1 14 1>;
 		};
 
 		lan {
 			label = "zbt-wr8305rt:green:usb";
 			gpios = <&gpio1 15 1>;
 		};
 
 		wifi {
 			label = "zbt-wr8305rt:green:wifi";
 			gpios = <&gpio3 0 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio0 1 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &gpio3 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
 
 &ethernet {
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "llllw";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		ephy {
 			ralink,group = "ephy";
 			ralink,function = "ephy";
 		};
 
 		default {
 			ralink,group = "i2c", "uartf", "spi refclk", "wled";
 			ralink,function = "gpio";
 		};
 	};
 };
Index: head/sys/gnu/dts/mips/ZTE-Q7.dts
===================================================================
--- head/sys/gnu/dts/mips/ZTE-Q7.dts	(revision 300657)
+++ head/sys/gnu/dts/mips/ZTE-Q7.dts	(revision 300658)
@@ -1,111 +1,111 @@
 /dts-v1/;
 
 #include "mt7620a.dtsi"
 
 / {
 	compatible = "ZTE-Q7", "ralink,mt7620a-soc";
 	model = "ZTE Q7";
 
 	gpio-leds {
 		compatible = "gpio-leds";
 
 		statred {
 			label = "zte-q7:red:status";
 			gpios = <&gpio0 13 1>;
 		};
 
 		statblue {
 			label = "zte-q7:blue:status";
 			gpios = <&gpio0 9 1>;
 		};
 	};
 
 	gpio-keys-polled {
 		compatible = "gpio-keys-polled";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		poll-interval = <20>;
 
 		reset {
 			label = "reset";
 			gpios = <&gpio1 2 1>;
 			linux,code = <0x198>;
 		};
 	};
 };
 
 &gpio0 {
 	status = "okay";
 };
 
 &gpio1 {
 	status = "okay";
 };
 
 &spi0 {
 	status = "okay";
 
 	m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
 		partition@0 {
 			label = "u-boot";
 			reg = <0x0 0x30000>;
 			read-only;
 		};
 
 		partition@30000 {
 			label = "u-boot-env";
 			reg = <0x30000 0x10000>;
 			read-only;
 		};
 
 		factory: partition@40000 {
 			label = "factory";
 			reg = <0x40000 0x10000>;
 			read-only;
 		};
 
 		partition@50000 {
 			label = "firmware";
 			reg = <0x50000 0x7b0000>;
 		};
 	};
 };
 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "uartf", "rgmii1", "rgmii2", "ephy", "wled", "nd_sd";
 			ralink,function = "gpio";
 		};
 	};
 };
 
 &ethernet {
 	pinctrl-names = "default";
 	pinctrl-0 = <&ephy_pins>;
 	mtd-mac-address = <&factory 0x4>;
 	mediatek,portmap = "wllll";
 };
 
 &wmac {
 	ralink,mtd-eeprom = <&factory 0>;
 };
 
 &sdhci {
 	status = "okay";
 };
 
 &ehci {
 	status = "okay";
 };
 
 &ohci {
 	status = "okay";
 };
Index: head/sys/gnu/dts/mips/mt7620a.dtsi
===================================================================
--- head/sys/gnu/dts/mips/mt7620a.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/mt7620a.dtsi	(revision 300658)
@@ -1,550 +1,550 @@
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 	compatible = "ralink,mtk7620a-soc";
 
 	cpus {
 		cpu@0 {
 			compatible = "mips,mips24KEc";
 		};
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	cpuintc: cpuintc@0 {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
 		compatible = "mti,cpu-interrupt-controller";
 	};
 
 	aliases {
 		spi0 = &spi0;
 		spi1 = &spi1;
 		serial0 = &uartlite;
 	};
 
 	palmbus: palmbus@10000000 {
 		compatible = "palmbus";
 		reg = <0x10000000 0x200000>;
 		ranges = <0x0 0x10000000 0x1FFFFF>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		sysc: sysc@0 {
 			compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc";
 			reg = <0x0 0x100>;
 		};
 
 		timer: timer@100 {
 			compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer";
 			reg = <0x100 0x20>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		watchdog: watchdog@120 {
 			compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt";
 			reg = <0x120 0x10>;
 
 			resets = <&rstctrl 8>;
 			reset-names = "wdt";
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		intc: intc@200 {
 			compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc";
 			reg = <0x200 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "intc";
 
 			interrupt-controller;
 			#interrupt-cells = <1>;
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <2>;
 		};
 
 		memc: memc@300 {
 			compatible = "ralink,mt7620a-memc", "ralink,rt3050-memc";
 			reg = <0x300 0x100>;
 
 			resets = <&rstctrl 20>;
 			reset-names = "mc";
 
 			interrupt-parent = <&intc>;
 			interrupts = <3>;
 		};
 
 		uart: uart@500 {
 			compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0x500 0x100>;
 
 			resets = <&rstctrl 12>;
 			reset-names = "uart";
 
 			interrupt-parent = <&intc>;
 			interrupts = <5>;
 
 			reg-shift = <2>;
 
 			status = "disabled";
 		};
 
 		gpio0: gpio@600 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x600 0x34>;
 
 			resets = <&rstctrl 13>;
 			reset-names = "pio";
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <0>;
 			ralink,num-gpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
 		};
 
 		gpio1: gpio@638 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x638 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <24>;
 			ralink,num-gpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		gpio2: gpio@660 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x660 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <40>;
 			ralink,num-gpios = <32>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		gpio3: gpio@688 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x688 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <72>;
 			ralink,num-gpios = <1>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		i2c: i2c@900 {
 			compatible = "link,mt7620a-i2c", "ralink,rt2880-i2c";
 			reg = <0x900 0x100>;
 
 			resets = <&rstctrl 16>;
 			reset-names = "i2c";
 
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			status = "disabled";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c_pins>;
 		};
 
 		i2s: i2s@a00 {
 			compatible = "ralink,mt7620a-i2s";
 			reg = <0xa00 0x100>;
 
 			resets = <&rstctrl 17>;
 			reset-names = "i2s";
 
 			interrupt-parent = <&intc>;
 			interrupts = <10>;
 
 			dmas = <&gdma 4>,
 				<&gdma 5>;
 			dma-names = "tx", "rx";
 
 			status = "disabled";
 		};
 
 		spi0: spi@b00 {
 			compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
 			reg = <0xb00 0x40>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			status = "disabled";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
 		};
 
 		spi1: spi@b40 {
 			compatible = "ralink,rt2880-spi";
 			reg = <0xb40 0x60>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			status = "disabled";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_cs1>;
 		};
 
 		uartlite: uartlite@c00 {
 			compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0xc00 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "uartl";
 
 			interrupt-parent = <&intc>;
 			interrupts = <12>;
 
 			reg-shift = <2>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&uartlite_pins>;
 		};
 
 		systick: systick@d00 {
 			compatible = "ralink,mt7620a-systick", "ralink,cevt-systick";
 			reg = <0xd00 0x10>;
 
 			resets = <&rstctrl 28>;
 			reset-names = "intc";
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <7>;
 		};
 
 		pcm: pcm@2000 {
 			compatible = "ralink,mt7620a-pcm";
 			reg = <0x2000 0x800>;
 
 			resets = <&rstctrl 11>;
 			reset-names = "pcm";
 
 			interrupt-parent = <&intc>;
 			interrupts = <4>;
 
 			status = "disabled";
 		};
 
 		gdma: gdma@2800 {
 			compatible = "ralink,mt7620a-gdma", "ralink,rt2880-gdma";
 			reg = <0x2800 0x800>;
 
 			resets = <&rstctrl 14>;
 			reset-names = "dma";
 
 			interrupt-parent = <&intc>;
 			interrupts = <7>;
 
 			#dma-cells = <1>;
 			#dma-channels = <16>;
 			#dma-requests = <16>;
 
 			status = "disabled";
 		};
 	};
 
 	pinctrl: pinctrl {
 		compatible = "ralink,rt2880-pinmux";
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
 		state_default: pinctrl0 {
 		};
 
 		pcm_i2s_pins: pcm_i2s {
 			pcm_i2s {
 				ralink,group = "uartf";
 				ralink,function = "pcm i2s";
 			};
 		};
 
 		uartf_gpio_pins: uartf_gpio {
 			uartf_gpio {
 				ralink,group = "uartf";
 				ralink,function = "gpio uartf";
 			};
 		};
 
 		spi_pins: spi {
 			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
 		};
 
 		spi_cs1: spi1 {
 			spi1 {
 				ralink,group = "spi_cs1";
 				ralink,function = "spi_cs1";
 			};
 		};
 
 		i2c_pins: i2c {
 			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
 		uartlite_pins: uartlite {
 			uart {
 				ralink,group = "uartlite";
 				ralink,function = "uartlite";
 			};
 		};
 
 		mdio_pins: mdio {
 			mdio {
 				ralink,group = "mdio";
 				ralink,function = "mdio";
 			};
 		};
 
 		ephy_pins: ephy {
 			ephy {
 				ralink,group = "ephy";
 				ralink,function = "ephy";
 			};
 		};
 
 		wled_pins: wled {
 			wled {
 				ralink,group = "wled";
 				ralink,function = "wled";
 			};
 		};
 
 		rgmii1_pins: rgmii1 {
 			rgmii1 {
 				ralink,group = "rgmii1";
 				ralink,function = "rgmii1";
 			};
 		};
 
 		rgmii2_pins: rgmii2 {
 			rgmii2 {
 				ralink,group = "rgmii2";
 				ralink,function = "rgmii2";
 			};
 		};
 
 		pcie_pins: pcie {
 			pcie {
 				ralink,group = "pcie";
 				ralink,function = "pcie rst";
 			};
 		};
 	};
 
 	rstctrl: rstctrl {
 		compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset";
 		#reset-cells = <1>;
 	};
 
 	clkctrl: clkctrl {
 		compatible = "ralink,rt2880-clock";
 		#clock-cells = <1>;
 	};
 
 	usbphy: usbphy {
 		compatible = "mediatek,mt7620-usbphy";
 		#phy-cells = <1>;
 
 		resets = <&rstctrl 22 &rstctrl 25>;
 		reset-names = "host", "device";
 
 		clocks = <&clkctrl 22 &clkctrl 25>;
 		clock-names = "host", "device";
 	};
 
 	ethernet: ethernet@10100000 {
 		compatible = "mediatek,mt7620-eth";
 		reg = <0x10100000 0x10000>;
 
 		#address-cells = <1>;
 		#size-cells = <0>;
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <5>;
 
 		resets = <&rstctrl 21 &rstctrl 23>;
 		reset-names = "fe", "esw";
 
 		mediatek,switch = <&gsw>;
 
 		port@4 {
 			compatible = "mediatek,mt7620a-gsw-port", "mediatek,eth-port";
 			reg = <4>;
 
 			status = "disabled";
 		};
 
 		port@5 {
 			compatible = "mediatek,mt7620a-gsw-port", "mediatek,eth-port";
 			reg = <5>;
 
 			status = "disabled";
 		};
 
 		mdio-bus {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			status = "disabled";
 		};
 	};
 
 	gsw: gsw@10110000 {
 		compatible = "mediatek,mt7620-gsw";
 		reg = <0x10110000 0x8000>;
 
 		resets = <&rstctrl 23>;
 		reset-names = "esw";
 
 		interrupt-parent = <&intc>;
 		interrupts = <17>;
 	};
 
 	sdhci: sdhci@10130000 {
 		compatible = "ralink,mt7620-sdhci";
 		reg = <0x10130000 0x4000>;
 
 		interrupt-parent = <&intc>;
 		interrupts = <14>;
 
 		status = "disabled";
 	};
 
 	ehci: ehci@101c0000 {
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		status = "disabled";
 	};
 
 	ohci: ohci@101c1000 {
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		status = "disabled";
 	};
 
 	pcie: pcie@10140000 {
 		compatible = "mediatek,mt7620-pci";
 		reg = <0x10140000 0x100
 			0x10142000 0x100>;
 
 		#address-cells = <3>;
 		#size-cells = <2>;
 
 		resets = <&rstctrl 26>;
 		reset-names = "pcie0";
 
 		clocks = <&clkctrl 26>;
 		clock-names = "pcie0";
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <4>;
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&pcie_pins>;
 
 		device_type = "pci";
 
 		bus-range = <0 255>;
 		ranges = <
 			0x02000000 0 0x00000000 0x20000000 0 0x10000000 /* pci memory */
 			0x01000000 0 0x00000000 0x10160000 0 0x00010000 /* io space */
 		>;
 
 		status = "disabled";
 
 		pcie-bridge {
 			reg = <0x0000 0 0 0 0>;
 
 			#address-cells = <3>;
 			#size-cells = <2>;
 
 			device_type = "pci";
 		};
 	};
 
 	wmac: wmac@10180000 {
 		compatible = "ralink,rt7620-wmac", "ralink,rt2880-wmac";
 		reg = <0x10180000 0x40000>;
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <6>;
 
 		ralink,eeprom = "soc_wmac.eeprom";
 	};
 };
 
 #include "fbsd-mt7620a.dtsi"
Index: head/sys/gnu/dts/mips/mt7620n.dtsi
===================================================================
--- head/sys/gnu/dts/mips/mt7620n.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/mt7620n.dtsi	(revision 300658)
@@ -1,344 +1,344 @@
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 	compatible = "ralink,mtk7620n-soc";
 
 	cpus {
 		cpu@0 {
 			compatible = "mips,mips24KEc";
 		};
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	cpuintc: cpuintc@0 {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
 		compatible = "mti,cpu-interrupt-controller";
 	};
 
 	aliases {
 		spi0 = &spi0;
 		spi1 = &spi1;
 		serial0 = &uartlite;
 	};
 
 	palmbus: palmbus@10000000 {
 		compatible = "palmbus";
 		reg = <0x10000000 0x200000>;
 		ranges = <0x0 0x10000000 0x1FFFFF>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		sysc: sysc@0 {
 			compatible = "ralink,mt7620a-sysc", "ralink,rt3050-sysc";
 			reg = <0x0 0x100>;
 		};
 
 		timer: timer@100 {
 			compatible = "ralink,mt7620a-timer", "ralink,rt2880-timer";
 			reg = <0x100 0x20>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		watchdog: watchdog@120 {
 			compatible = "ralink,mt7620a-wdt", "ralink,rt2880-wdt";
 			reg = <0x120 0x10>;
 
 			resets = <&rstctrl 8>;
 			reset-names = "wdt";
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		intc: intc@200 {
 			compatible = "ralink,mt7620a-intc", "ralink,rt2880-intc";
 			reg = <0x200 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "intc";
 
 			interrupt-controller;
 			#interrupt-cells = <1>;
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <2>;
 		};
 
 		memc: memc@300 {
 			compatible = "ralink,mt7620a-memc", "ralink,rt3050-memc";
 			reg = <0x300 0x100>;
 
 			resets = <&rstctrl 20>;
 			reset-names = "mc";
 
 			interrupt-parent = <&intc>;
 			interrupts = <3>;
 		};
 
 		gpio0: gpio@600 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x600 0x34>;
 
 			resets = <&rstctrl 13>;
 			reset-names = "pio";
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <0>;
 			ralink,num-gpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
 		};
 
 		gpio1: gpio@638 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x638 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <24>;
 			ralink,num-gpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		gpio2: gpio@660 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x660 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <40>;
 			ralink,num-gpios = <32>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		gpio3: gpio@688 {
 			compatible = "ralink,mt7620a-gpio", "ralink,rt2880-gpio";
 			reg = <0x688 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <72>;
 			ralink,num-gpios = <1>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		spi0: spi@b00 {
 			compatible = "ralink,mt7620a-spi", "ralink,rt2880-spi";
 			reg = <0xb00 0x40>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			status = "disabled";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
 		};
 
 		spi1: spi@b40 {
 			compatible = "ralink,rt2880-spi";
 			reg = <0xb40 0x60>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			status = "disabled";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_cs1>;
 		};
 
 		uartlite: uartlite@c00 {
 			compatible = "ralink,mt7620a-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0xc00 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "uartl";
 
 			interrupt-parent = <&intc>;
 			interrupts = <12>;
 
 			reg-shift = <2>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&uartlite_pins>;
 		};
 
 		systick: systick@d00 {
 			compatible = "ralink,mt7620a-systick", "ralink,cevt-systick";
 			reg = <0xd00 0x10>;
 
 			resets = <&rstctrl 28>;
 			reset-names = "intc";
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <7>;
 		};
 	};
 
 	pinctrl: pinctrl {
 		compatible = "ralink,rt2880-pinmux";
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
 		state_default: pinctrl0 {
 		};
 
 		spi_pins: spi {
 			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
 		};
 
 		spi_cs1: spi1 {
 			spi1 {
 				ralink,group = "spi_cs1";
 				ralink,function = "spi_cs1";
 			};
 		};
 
 		uartlite_pins: uartlite {
 			uart {
 				ralink,group = "uartlite";
 				ralink,function = "uartlite";
 			};
 		};
 	};
 
 	rstctrl: rstctrl {
 		compatible = "ralink,mt7620a-reset", "ralink,rt2880-reset";
 		#reset-cells = <1>;
 	};
 
 	clkctrl: clkctrl {
 		compatible = "ralink,rt2880-clock";
 		#clock-cells = <1>;
 	};
 
 	usbphy: usbphy {
 		compatible = "mediatek,mt7620-usbphy";
 		#phy-cells = <1>;
 
 		resets = <&rstctrl 22 &rstctrl 25>;
 		reset-names = "host", "device";
 
 		clocks = <&clkctrl 22 &clkctrl 25>;
 		clock-names = "host", "device";
 	};
 
 	ethernet: ethernet@10100000 {
 		compatible = "mediatek,mt7620-eth";
 		reg = <0x10100000 0x10000>;
 
 		#address-cells = <1>;
 		#size-cells = <0>;
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <5>;
 
 		resets = <&rstctrl 21 &rstctrl 23>;
 		reset-names = "fe", "esw";
 
 		mediatek,switch = <&gsw>;
 
 		mdio-bus {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			status = "disabled";
 		};
 	};
 
 	gsw: gsw@10110000 {
 		compatible = "mediatek,mt7620-gsw";
 		reg = <0x10110000 0x8000>;
 
 		resets = <&rstctrl 23>;
 		reset-names = "esw";
 
 		interrupt-parent = <&intc>;
 		interrupts = <17>;
 		mediatek,port4 = "gmac";
 	};
 
 	ehci: ehci@101c0000 {
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		status = "disabled";
 	};
 
 	ohci: ohci@101c1000 {
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 
 		status = "disabled";
 	};
 
 	wmac: wmac@10180000 {
 		compatible = "ralink,rt7620-wmac", "ralink,rt2880-wmac";
 		reg = <0x10180000 0x40000>;
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <6>;
 
 		ralink,eeprom = "soc_wmac.eeprom";
 	};
 };
Index: head/sys/gnu/dts/mips/mt7621.dtsi
===================================================================
--- head/sys/gnu/dts/mips/mt7621.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/mt7621.dtsi	(revision 300658)
@@ -1,392 +1,392 @@
 #include <dt-bindings/interrupt-controller/mips-gic.h>
 
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 	compatible = "mediatek,mtk7621-soc";
 
 	cpus {
 		cpu@0 {
 			compatible = "mips,mips1004Kc";
 		};
 
 		cpu@1 {
 			compatible = "mips,mips1004Kc";
 		};
 	};
 
 	cpuintc: cpuintc@0 {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
 		compatible = "mti,cpu-interrupt-controller";
 	};
 
 	aliases {
 		serial0 = &uartlite;
 	};
 
 	cpuclock: cpuclock@0 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 
 		/* FIXME: there should be way to detect this */
 		clock-frequency = <880000000>;
 	};
 
 	sysclock: sysclock@0 {
 		#clock-cells = <0>;
 		compatible = "fixed-clock";
 
 		/* FIXME: there should be way to detect this */
 		clock-frequency = <50000000>;
 	};
 
 	palmbus: palmbus@1E000000 {
 		compatible = "palmbus";
 		reg = <0x1E000000 0x100000>;
 		ranges = <0x0 0x1E000000 0x0FFFFF>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		sysc: sysc@0 {
 			compatible = "mtk,mt7621-sysc";
 			reg = <0x0 0x100>;
 		};
 
 		wdt: wdt@100 {
 			compatible = "mtk,mt7621-wdt";
 			reg = <0x100 0x100>;
 		};
 
 		gpio@600 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			compatible = "mtk,mt7621-gpio";
 			reg = <0x600 0x100>;
 
 			gpio0: bank@0 {
 				reg = <0>;
 				compatible = "mtk,mt7621-gpio-bank";
 				gpio-controller;
 				#gpio-cells = <2>;
 			};
 
 			gpio1: bank@1 {
 				reg = <1>;
 				compatible = "mtk,mt7621-gpio-bank";
 				gpio-controller;
 				#gpio-cells = <2>;
 			};
 
 			gpio2: bank@2 {
 				reg = <2>;
 				compatible = "mtk,mt7621-gpio-bank";
 				gpio-controller;
 				#gpio-cells = <2>;
 			};
 		};
 
 		memc: memc@5000 {
 			compatible = "mtk,mt7621-memc";
 			reg = <0x300 0x100>;
 		};
 
 		cpc: cpc@1fbf0000 {
 			     compatible = "mtk,mt7621-cpc";
 			     reg = <0x1fbf0000 0x8000>;
 		};
 
 		mc: mc@1fbf8000 {
 			    compatible = "mtk,mt7621-mc";
 			    reg = <0x1fbf8000 0x8000>;
  		};
 
 		uartlite: uartlite@c00 {
 			compatible = "ns16550a";
 			reg = <0xc00 0x100>;
 
 			clocks = <&sysclock>;
 			clock-frequency = <50000000>;
 
 			interrupt-parent = <&gic>;
 			interrupts = <GIC_SHARED 26 IRQ_TYPE_LEVEL_HIGH>;
 
 			reg-shift = <2>;
 			reg-io-width = <4>;
 			no-loopback-test;
 		};
 
 		spi0: spi@b00 {
 			status = "okay";
 
 			compatible = "ralink,mt7621-spi";
 			reg = <0xb00 0x100>;
 
 			clocks = <&sysclock>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
 
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				reg = <0 0>;
+				reg = <0>;
 				spi-max-frequency = <10000000>;
 				m25p,chunked-io = <32>;
 			};
 		};
 	};
 
 	pinctrl: pinctrl {
 		compatible = "ralink,rt2880-pinmux";
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
 		state_default: pinctrl0 {
 		};
 
 		spi_pins: spi {
 			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
 		};
 
 		i2c_pins: i2c {
 			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
 		uart1_pins: uart1 {
 			uart1 {
 				ralink,group = "uart1";
 				ralink,function = "uart1";
 			};
 		};
 
 		uart2_pins: uart2 {
 			uart2 {
 				ralink,group = "uart2";
 				ralink,function = "uart2";
 			};
 		};
 
 		uart3_pins: uart3 {
 			uart3 {
 				ralink,group = "uart3";
 				ralink,function = "uart3";
 			};
 		};
 
 		rgmii1_pins: rgmii1 {
 			rgmii1 {
 				ralink,group = "rgmii1";
 				ralink,function = "rgmii1";
 			};
 		};
 
 		rgmii2_pins: rgmii2 {
 			rgmii2 {
 				ralink,group = "rgmii2";
 				ralink,function = "rgmii2";
 			};
 		};
 
 		mdio_pins: mdio {
 			mdio {
 				ralink,group = "mdio";
 				ralink,function = "mdio";
 			};
 		};
 
 		pcie_pins: pcie {
 			pcie {
 				ralink,group = "pcie";
 				ralink,function = "pcie rst";
 			};
 		};
 
 		nand_pins: nand {
 			spi-nand {
 				ralink,group = "spi";
 				ralink,function = "nand1";
 			};
 
 			sdhci-nand {
 				ralink,group = "sdhci";
 				ralink,function = "nand2";
 			};
 		};
 
 		sdhci_pins: sdhci {
 			sdhci {
 				ralink,group = "sdhci";
 				ralink,function = "sdhci";
 			};
 		};
 	};
 
 	rstctrl: rstctrl {
 		compatible = "ralink,rt2880-reset";
 		#reset-cells = <1>;
 	};
 
 	clkctrl: clkctrl {
 		compatible = "ralink,rt2880-clock";
 		#clock-cells = <1>;
 	};
 
 	sdhci: sdhci@1E130000 {
 		compatible = "ralink,mt7620-sdhci";
 		reg = <0x1E130000 0x4000>;
 
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	xhci: xhci@1E1C0000 {
 		status = "okay";
 
 		compatible = "mediatek,mt8173-xhci";
 		reg = <0x1e1c0000 0x1000
 		       0x1e1d0700 0x0100>;
 
 		clocks = <&sysclock>;
 		clock-names = "sys_ck";
 
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 22 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	gic: interrupt-controller@1fbc0000 {
 		compatible = "mti,gic";
 		reg = <0x1fbc0000 0x2000>;
 
 		interrupt-controller;
 		#interrupt-cells = <3>;
 
 		mti,reserved-cpu-vectors = <7>;
 
 		timer {
 			compatible = "mti,gic-timer";
 			interrupts = <GIC_LOCAL 1 IRQ_TYPE_NONE>;
 			clocks = <&cpuclock>;
 		};
 	};
 
 	nand: nand@1e003000 {
 		status = "disabled";
 
 		compatible = "mtk,mt7621-nand";
 		bank-width = <2>;
 		reg = <0x1e003000 0x800
 			0x1e003800 0x800>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 	};
 
 	ethernet: ethernet@1e100000 {
 		compatible = "mediatek,mt7621-eth";
 		reg = <0x1e100000 0x10000>;
 
 		#address-cells = <1>;
 		#size-cells = <0>;
 
 		resets = <&rstctrl 6 &rstctrl 23>;
 		reset-names = "fe", "eth";
 
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH>;
 
 		mediatek,switch = <&gsw>;
 
 		mdio-bus {
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			phy1f: ethernet-phy@1f {
 				reg = <0x1f>;
 				phy-mode = "rgmii";
 			};
 		};
 	};
 
 	gsw: gsw@1e110000 {
 		compatible = "mediatek,mt7621-gsw";
 		reg = <0x1e110000 0x8000>;
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
 	pcie: pcie@1e140000 {
 		compatible = "mediatek,mt7621-pci";
 		reg = <0x1e140000 0x100
 			0x1e142000 0x100>;
 
 		#address-cells = <3>;
 		#size-cells = <2>;
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&pcie_pins>;
 
 		device_type = "pci";
 
 		bus-range = <0 255>;
 		ranges = <
 			0x02000000 0 0x00000000 0x60000000 0 0x10000000 /* pci memory */
 			0x01000000 0 0x00000000 0x1e160000 0 0x00010000 /* io space */
 		>;
 
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 4 IRQ_TYPE_LEVEL_HIGH
 				GIC_SHARED 24 IRQ_TYPE_LEVEL_HIGH
 				GIC_SHARED 25 IRQ_TYPE_LEVEL_HIGH>;
 
 		status = "okay";
 
 		resets = <&rstctrl 24 &rstctrl 25 &rstctrl 26>;
 		reset-names = "pcie0", "pcie1", "pcie2";
 		clocks = <&clkctrl 24 &clkctrl 25 &clkctrl 26>;
 		clock-names = "pcie0", "pcie1", "pcie2";
 
 		pcie0 {
 			reg = <0x0000 0 0 0 0>;
 
 			#address-cells = <3>;
 			#size-cells = <2>;
 
 			device_type = "pci";
 		};
 
 		pcie1 {
 			reg = <0x0800 0 0 0 0>;
 
 			#address-cells = <3>;
 			#size-cells = <2>;
 
 			device_type = "pci";
 		};
 
 		pcie2 {
 			reg = <0x1000 0 0 0 0>;
 
 			#address-cells = <3>;
 			#size-cells = <2>;
 
 			device_type = "pci";
 		};
 	};
 };
 
 #include "fbsd-mt7621.dtsi"
Index: head/sys/gnu/dts/mips/rt3352.dtsi
===================================================================
--- head/sys/gnu/dts/mips/rt3352.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/rt3352.dtsi	(revision 300658)
@@ -1,306 +1,306 @@
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 	compatible = "ralink,rt3352-soc";
 
 	cpus {
 		cpu@0 {
 			compatible = "mips,mips24KEc";
 		};
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	cpuintc: cpuintc@0 {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
 		compatible = "mti,cpu-interrupt-controller";
 	};
 
 	aliases {
 		spi0 = &spi0;
 		spi1 = &spi1;
 		serial0 = &uartlite;
 	};
 
 	palmbus: palmbus@10000000 {
 		compatible = "palmbus";
 		reg = <0x10000000 0x200000>;
 		ranges = <0x0 0x10000000 0x1FFFFF>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		sysc: sysc@0 {
 			compatible = "ralink,rt3352-sysc", "ralink,rt3050-sysc";
 			reg = <0x0 0x100>;
 		};
 
 		timer: timer@100 {
 			compatible = "ralink,rt3352-timer", "ralink,rt2880-timer";
 			reg = <0x100 0x20>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		watchdog: watchdog@120 {
 			compatible = "ralink,rt3352-wdt", "ralink,rt2880-wdt";
 			reg = <0x120 0x10>;
 
 			resets = <&rstctrl 8>;
 			reset-names = "wdt";
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		intc: intc@200 {
 			compatible = "ralink,rt3352-intc", "ralink,rt2880-intc";
 			reg = <0x200 0x100>;
 
 			interrupt-controller;
 			#interrupt-cells = <1>;
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <2>;
 		};
 
 		memc: memc@300 {
 			compatible = "ralink,rt3352-memc", "ralink,rt3050-memc";
 			reg = <0x300 0x100>;
 
 			resets = <&rstctrl 20>;
 			reset-names = "mc";
 
 			interrupt-parent = <&intc>;
 			interrupts = <3>;
 		};
 
 		uart: uart@500 {
 			compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0x500 0x100>;
 
 			resets = <&rstctrl 12>;
 			reset-names = "uart";
 
 			interrupt-parent = <&intc>;
 			interrupts = <5>;
 
 			reg-shift = <2>;
 
 			status = "disabled";
 		};
 
 		gpio0: gpio@600 {
 			compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio";
 			reg = <0x600 0x34>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <0>;
 			ralink,num-gpios = <24>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
 			resets = <&rstctrl 13>;
 			reset-names = "pio";
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 		};
 
 		gpio1: gpio@638 {
 			compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio";
 			reg = <0x638 0x24>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <24>;
 			ralink,num-gpios = <16>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		gpio2: gpio@660 {
 			compatible = "ralink,rt3352-gpio", "ralink,rt2880-gpio";
 			reg = <0x660 0x24>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <40>;
 			ralink,num-gpios = <6>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		spi0: spi@b00 {
 			compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
 			reg = <0xb00 0x40>;
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
 
 			status = "disabled";
 		};
 
 		spi1: spi@b40 {
 			compatible = "ralink,rt3352-spi", "ralink,rt2880-spi";
 			reg = <0xb40 0x60>;
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_cs1>;
 
 			status = "disabled";
 		};
 
 		uartlite: uartlite@c00 {
 			compatible = "ralink,rt3352-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0xc00 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "uartl";
 
 			interrupt-parent = <&intc>;
 			interrupts = <12>;
 
 			reg-shift = <2>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&uartlite_pins>;
 		};
 	};
 
 	pinctrl: pinctrl {
 		compatible = "ralink,rt2880-pinmux";
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
 		state_default: pinctrl0 {
 		};
 
 		spi_pins: spi {
 			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
 		};
 
 		spi_cs1: spi1 {
 			spi1 {
 				ralink,group = "spi_cs1";
 				ralink,function = "spi_cs1";
 			};
 		};
 
 		uartlite_pins: uartlite {
 			uart {
 				ralink,group = "uartlite";
 				ralink,function = "uartlite";
 			};
 		};
 	};
 
 	rstctrl: rstctrl {
 		compatible = "ralink,rt3352-reset", "ralink,rt2880-reset";
 		#reset-cells = <1>;
 	};
 
 	clkctrl: clkctrl {
 		compatible = "ralink,rt2880-clock";
 		#clock-cells = <1>;
 	};
 
 	ethernet: ethernet@10100000 {
 		compatible = "ralink,rt3352-eth", "ralink,rt3050-eth";
 		reg = <0x10100000 0x10000>;
 
 		resets = <&rstctrl 21>;
 		reset-names = "fe";
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <5>;
 
 		mediatek,switch = <&esw>;
 	};
 
 	esw: esw@10110000 {
 		compatible = "ralink,rt3352-esw", "ralink,rt3050-esw";
 		reg = <0x10110000 0x8000>;
 
 		resets = <&rstctrl 23>;
 		reset-names = "esw";
 
 		interrupt-parent = <&intc>;
 		interrupts = <17>;
 	};
 
 	usbphy: usbphy {
 		compatible = "ralink,rt3352-usbphy";
 		#phy-cells = <1>;
 
 		resets = <&rstctrl 22 &rstctrl 25>;
 		reset-names = "host", "device";
 		clocks = <&clkctrl 18 &clkctrl 20>;
 		clock-names = "host", "device";
 	};
 
 	wmac: wmac@10180000 {
 		compatible = "ralink,rt3352-wmac", "ralink,rt2880-wmac";
 		reg = <0x10180000 0x40000>;
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <6>;
 
 		ralink,eeprom = "soc_wmac.eeprom";
 	};
 
 	ehci: ehci@101c0000 {
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 
 		status = "disabled";
 	};
 
 	ohci: ohci@101c1000 {
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 
 		status = "disabled";
 	};
 };
Index: head/sys/gnu/dts/mips/rt5350.dtsi
===================================================================
--- head/sys/gnu/dts/mips/rt5350.dtsi	(revision 300657)
+++ head/sys/gnu/dts/mips/rt5350.dtsi	(revision 300658)
@@ -1,340 +1,340 @@
 / {
 	#address-cells = <1>;
 	#size-cells = <1>;
 	compatible = "ralink,rt5350-soc";
 
 	cpus {
 		cpu@0 {
 			compatible = "mips,mips24KEc";
 		};
 	};
 
 	chosen {
 		bootargs = "console=ttyS0,57600";
 	};
 
 	cpuintc: cpuintc@0 {
 		#address-cells = <0>;
 		#interrupt-cells = <1>;
 		interrupt-controller;
 		compatible = "mti,cpu-interrupt-controller";
 	};
 
 	aliases {
 		spi0 = &spi0;
 		spi1 = &spi1;
 		serial0 = &uartlite;
 	};
 
 	palmbus: palmbus@10000000 {
 		compatible = "palmbus";
 		reg = <0x10000000 0x200000>;
 		ranges = <0x0 0x10000000 0x1FFFFF>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
 
 		sysc: sysc@0 {
 			compatible = "ralink,rt5350-sysc", "ralink,rt3050-sysc";
 			reg = <0x0 0x100>;
 		};
 
 		timer: timer@100 {
 			compatible = "ralink,rt5350-timer", "ralink,rt2880-timer";
 			reg = <0x100 0x20>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		watchdog: watchdog@120 {
 			compatible = "ralink,rt5350-wdt", "ralink,rt2880-wdt";
 			reg = <0x120 0x10>;
 
 			resets = <&rstctrl 8>;
 			reset-names = "wdt";
 
 			interrupt-parent = <&intc>;
 			interrupts = <1>;
 		};
 
 		intc: intc@200 {
 			compatible = "ralink,rt5350-intc", "ralink,rt2880-intc";
 			reg = <0x200 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "intc";
 
 			interrupt-controller;
 			#interrupt-cells = <1>;
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <2>;
 		};
 
 		memc: memc@300 {
 			compatible = "ralink,rt5350-memc", "ralink,rt3050-memc";
 			reg = <0x300 0x100>;
 
 			resets = <&rstctrl 20>;
 			reset-names = "mc";
 
 			interrupt-parent = <&intc>;
 			interrupts = <3>;
 		};
 
 		uart: uart@500 {
 			compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0x500 0x100>;
 
 			resets = <&rstctrl 12>;
 			reset-names = "uart";
 
 			interrupt-parent = <&intc>;
 			interrupts = <5>;
 
 			reg-shift = <2>;
 
 			status = "disabled";
 		};
 
 		gpio0: gpio@600 {
 			compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio";
 			reg = <0x600 0x34>;
 
 			resets = <&rstctrl 13>;
 			reset-names = "pio";
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <0>;
 			ralink,num-gpios = <22>;
 			ralink,register-map = [ 00 04 08 0c
 						20 24 28 2c
 						30 34 ];
 		};
 
 		gpio1: gpio@660 {
 			compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio";
 			reg = <0x660 0x24>;
 
 			interrupt-parent = <&intc>;
 			interrupts = <6>;
 
 			gpio-controller;
 			#gpio-cells = <2>;
 
 			ralink,gpio-base = <22>;
 			ralink,num-gpios = <6>;
 			ralink,register-map = [ 00 04 08 0c
 						10 14 18 1c
 						20 24 ];
 
 			status = "disabled";
 		};
 
 		i2c: i2c@900 {
 			compatible = "link,rt5350-i2c", "ralink,rt2880-i2c";
 			reg = <0x900 0x100>;
 
 			resets = <&rstctrl 16>;
 			reset-names = "i2c";
 
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c_pins>;
 
 			status = "disabled";
 		};
 
 		spi0: spi@b00 {
 			compatible = "ralink,rt5350-spi", "ralink,rt2880-spi";
 			reg = <0xb00 0x40>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;
 
 			status = "disabled";
 		};
 
 		spi1: spi@b40 {
 			compatible = "ralink,rt5350-spi", "ralink,rt2880-spi";
 			reg = <0xb40 0x60>;
 
 			resets = <&rstctrl 18>;
 			reset-names = "spi";
 
 			#address-cells = <1>;
 			#size-cells = <0>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_cs1>;
 
 			status = "disabled";
 		};
 
 		uartlite: uartlite@c00 {
 			compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
 			reg = <0xc00 0x100>;
 
 			resets = <&rstctrl 19>;
 			reset-names = "uartl";
 
 			interrupt-parent = <&intc>;
 			interrupts = <12>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&uartlite_pins>;
 
 			reg-shift = <2>;
 		};
 
 		systick: systick@d00 {
 			compatible = "ralink,rt5350-systick", "ralink,cevt-systick";
 			reg = <0xd00 0x10>;
 
 			interrupt-parent = <&cpuintc>;
 			interrupts = <7>;
 		};
 	};
 
 	pinctrl: pinctrl {
 		compatible = "ralink,rt2880-pinmux";
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&state_default>;
 
 		state_default: pinctrl0 {
 		};
 
 		spi_pins: spi {
 			spi {
 				ralink,group = "spi";
 				ralink,function = "spi";
 			};
 		};
 
 		i2c_pins: i2c {
 			i2c {
 				ralink,group = "i2c";
 				ralink,function = "i2c";
 			};
 		};
 
 		phy_led_pins: phy_led {
 			phy_led {
 				ralink,group = "led";
 				ralink,function = "led";
 			};
 		};
 
 		uartlite_pins: uartlite {
 			uart {
 				ralink,group = "uartlite";
 				ralink,function = "uartlite";
 			};
 		};
 
 		uartf_pins: uartf {
 			uartf {
 				ralink,group = "uartf";
 				ralink,function = "uartf";
 			};
 		};
 
 		spi_cs1: spi1 {
 			spi1 {
 				ralink,group = "spi_cs1";
 				ralink,function = "spi_cs1";
 			};
 		};
 	};
 
 	rstctrl: rstctrl {
 		compatible = "ralink,rt5350-reset", "ralink,rt2880-reset";
 		#reset-cells = <1>;
 	};
 
 	clkctrl: clkctrl {
 		compatible = "ralink,rt2880-clock";
 		#clock-cells = <1>;
 	};
 
 	usbphy: usbphy {
 		compatible = "ralink,rt3352-usbphy";
 		#phy-cells = <1>;
 
 		resets = <&rstctrl 22 &rstctrl 25>;
 		reset-names = "host", "device";
 		clocks = <&clkctrl 18>;
 		clock-names = "host";
 	};
 
 	ethernet: ethernet@10100000 {
 		compatible = "ralink,rt5350-eth";
 		reg = <0x10100000 0x10000>;
 
 		resets = <&rstctrl 21 &rstctrl 23>;
 		reset-names = "fe", "esw";
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <5>;
 
 		mediatek,switch = <&esw>;
 	};
 
 	esw: esw@10110000 {
 		compatible = "ralink,rt5350-esw", "ralink,rt3050-esw";
 		reg = <0x10110000 0x8000>;
 
 		resets = <&rstctrl 23>;
 		reset-names = "esw";
 
 		interrupt-parent = <&intc>;
 		interrupts = <17>;
 	};
 
 	wmac: wmac@10180000 {
 		compatible = "ralink,rt5350-wmac", "ralink,rt2880-wmac";
 		reg = <0x10180000 0x40000>;
 
 		interrupt-parent = <&cpuintc>;
 		interrupts = <6>;
 
 		ralink,eeprom = "soc_wmac.eeprom";
 	};
 
 	ehci: ehci@101c0000 {
 		compatible = "generic-ehci";
 		reg = <0x101c0000 0x1000>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 	};
 
 	ohci: ohci@101c1000 {
 		compatible = "generic-ohci";
 		reg = <0x101c1000 0x1000>;
 
 		phys = <&usbphy 1>;
 		phy-names = "usb";
 
 		interrupt-parent = <&intc>;
 		interrupts = <18>;
 	};
 };