114 files changed, 127 insertions, 125 deletions

diff --git a/sys/gnu/dts/mips/3G150B.dts b/sys/gnu/dts/mips/3G150B.dts
index 3c92b94e0fa0e..3d348ff0f35a7 100644
--- a/sys/gnu/dts/mips/3G150B.dts
+++ b/sys/gnu/dts/mips/3G150B.dts
@@ -52,7 +52,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/3G300M.dts b/sys/gnu/dts/mips/3G300M.dts
index 331e9feaffe96..df770d83d5110 100644
--- a/sys/gnu/dts/mips/3G300M.dts
+++ b/sys/gnu/dts/mips/3G300M.dts
@@ -67,7 +67,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/A5-V11.dts b/sys/gnu/dts/mips/A5-V11.dts
index 6a15458399bc0..51eb005874606 100644
--- a/sys/gnu/dts/mips/A5-V11.dts
+++ b/sys/gnu/dts/mips/A5-V11.dts
@@ -58,7 +58,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "pm25lq032";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/AIR3GII.dts b/sys/gnu/dts/mips/AIR3GII.dts
index 2b6932da353d1..2b08895b496bc 100644
--- a/sys/gnu/dts/mips/AIR3GII.dts
+++ b/sys/gnu/dts/mips/AIR3GII.dts
@@ -45,7 +45,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q32b";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ALL0256N-4M.dts b/sys/gnu/dts/mips/ALL0256N-4M.dts
index 713b7356239b2..1cfaed67bb7c5 100644
--- a/sys/gnu/dts/mips/ALL0256N-4M.dts
+++ b/sys/gnu/dts/mips/ALL0256N-4M.dts
@@ -50,7 +50,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ALL0256N-8M.dts b/sys/gnu/dts/mips/ALL0256N-8M.dts
index 2c4790a363caf..074273d6088c0 100644
--- a/sys/gnu/dts/mips/ALL0256N-8M.dts
+++ b/sys/gnu/dts/mips/ALL0256N-8M.dts
@@ -50,7 +50,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ALL5002.dts b/sys/gnu/dts/mips/ALL5002.dts
index efaabc27d14dd..14bbdcdf12246 100644
--- a/sys/gnu/dts/mips/ALL5002.dts
+++ b/sys/gnu/dts/mips/ALL5002.dts
@@ -50,7 +50,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l25635e";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ALL5003.dts b/sys/gnu/dts/mips/ALL5003.dts
index 3a6023acd6f83..432dd516ff2f1 100644
--- a/sys/gnu/dts/mips/ALL5003.dts
+++ b/sys/gnu/dts/mips/ALL5003.dts
@@ -50,7 +50,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l25635e";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ASL26555-16M.dts b/sys/gnu/dts/mips/ASL26555-16M.dts
index 2b2c49492c623..56f3c9d99c9fb 100644
--- a/sys/gnu/dts/mips/ASL26555-16M.dts
+++ b/sys/gnu/dts/mips/ASL26555-16M.dts
@@ -81,7 +81,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25sl12801";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ASL26555-8M.dts b/sys/gnu/dts/mips/ASL26555-8M.dts
index 1c40df424db53..0dbc1dd337366 100644
--- a/sys/gnu/dts/mips/ASL26555-8M.dts
+++ b/sys/gnu/dts/mips/ASL26555-8M.dts
@@ -81,7 +81,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25sl064p";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/AWAPN2403.dts b/sys/gnu/dts/mips/AWAPN2403.dts
index d8e69bdd82d8e..7babe42d56f84 100644
--- a/sys/gnu/dts/mips/AWAPN2403.dts
+++ b/sys/gnu/dts/mips/AWAPN2403.dts
@@ -36,7 +36,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/AWM002.dtsi b/sys/gnu/dts/mips/AWM002.dtsi
index bf6876b9d58d9..9ff64917eac8f 100644
--- a/sys/gnu/dts/mips/AWM002.dtsi
+++ b/sys/gnu/dts/mips/AWM002.dtsi
@@ -25,7 +25,7 @@
 	m25p80: m25p80@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		reg = <0 0>;
+		reg = <0>;
 		compatible = "jedec,spi-nor";
 		spi-max-frequency = <10000000>;
 
@@ -55,7 +55,7 @@
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag";
 			ralink,function = "gpio";
diff --git a/sys/gnu/dts/mips/ArcherC20i.dts b/sys/gnu/dts/mips/ArcherC20i.dts
index aab1f9b90c422..e7a7b0734622e 100644
--- a/sys/gnu/dts/mips/ArcherC20i.dts
+++ b/sys/gnu/dts/mips/ArcherC20i.dts
@@ -33,7 +33,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/CF-WR800N.dts b/sys/gnu/dts/mips/CF-WR800N.dts
index d076e6432d0ed..913f142f35284 100644
--- a/sys/gnu/dts/mips/CF-WR800N.dts
+++ b/sys/gnu/dts/mips/CF-WR800N.dts
@@ -66,7 +66,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/CS-QR10.dts b/sys/gnu/dts/mips/CS-QR10.dts
index a55962f19962a..c3cb711a05f1e 100644
--- a/sys/gnu/dts/mips/CS-QR10.dts
+++ b/sys/gnu/dts/mips/CS-QR10.dts
@@ -79,7 +79,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DB-WRT01.dts b/sys/gnu/dts/mips/DB-WRT01.dts
index 8014859bf538f..4560dc5ca84b9 100644
--- a/sys/gnu/dts/mips/DB-WRT01.dts
+++ b/sys/gnu/dts/mips/DB-WRT01.dts
@@ -40,7 +40,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DCS-930L-B1.dts b/sys/gnu/dts/mips/DCS-930L-B1.dts
index c1e90b9602021..133245cb74b17 100644
--- a/sys/gnu/dts/mips/DCS-930L-B1.dts
+++ b/sys/gnu/dts/mips/DCS-930L-B1.dts
@@ -47,7 +47,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-300-B7.dts b/sys/gnu/dts/mips/DIR-300-B7.dts
index a634bb77542f7..9b9a6a4592601 100644
--- a/sys/gnu/dts/mips/DIR-300-B7.dts
+++ b/sys/gnu/dts/mips/DIR-300-B7.dts
@@ -47,7 +47,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-320-B1.dts b/sys/gnu/dts/mips/DIR-320-B1.dts
index 1393947886c32..102e06abf9ac2 100644
--- a/sys/gnu/dts/mips/DIR-320-B1.dts
+++ b/sys/gnu/dts/mips/DIR-320-B1.dts
@@ -69,7 +69,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-610-A1.dts b/sys/gnu/dts/mips/DIR-610-A1.dts
index 83faf00b43684..9ec66b4b003c1 100644
--- a/sys/gnu/dts/mips/DIR-610-A1.dts
+++ b/sys/gnu/dts/mips/DIR-610-A1.dts
@@ -47,7 +47,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-615-H1.dts b/sys/gnu/dts/mips/DIR-615-H1.dts
index be9cb1022d654..d53c82609f0e8 100644
--- a/sys/gnu/dts/mips/DIR-615-H1.dts
+++ b/sys/gnu/dts/mips/DIR-615-H1.dts
@@ -62,7 +62,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-620-D1.dts b/sys/gnu/dts/mips/DIR-620-D1.dts
index 53924672951f0..5cf330e66bbec 100644
--- a/sys/gnu/dts/mips/DIR-620-D1.dts
+++ b/sys/gnu/dts/mips/DIR-620-D1.dts
@@ -41,7 +41,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-645.dts b/sys/gnu/dts/mips/DIR-645.dts
index 1cdb321f7ff5e..d508297ac186e 100644
--- a/sys/gnu/dts/mips/DIR-645.dts
+++ b/sys/gnu/dts/mips/DIR-645.dts
@@ -69,7 +69,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <25000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-810L.dts b/sys/gnu/dts/mips/DIR-810L.dts
index 9e9c16d2fbf9f..1f9ad8a5d2d6a 100644
--- a/sys/gnu/dts/mips/DIR-810L.dts
+++ b/sys/gnu/dts/mips/DIR-810L.dts
@@ -52,7 +52,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/DIR-860L-B1.dts b/sys/gnu/dts/mips/DIR-860L-B1.dts
index 9ce9aa2890d99..b6336d87d355a 100644
--- a/sys/gnu/dts/mips/DIR-860L-B1.dts
+++ b/sys/gnu/dts/mips/DIR-860L-B1.dts
@@ -54,7 +54,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/E1700.dts b/sys/gnu/dts/mips/E1700.dts
index ed1f178f16170..36126ab42b0c0 100644
--- a/sys/gnu/dts/mips/E1700.dts
+++ b/sys/gnu/dts/mips/E1700.dts
@@ -57,7 +57,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/EX2700.dts b/sys/gnu/dts/mips/EX2700.dts
index 8d89a6bc872b9..c711adc6b4e75 100644
--- a/sys/gnu/dts/mips/EX2700.dts
+++ b/sys/gnu/dts/mips/EX2700.dts
@@ -95,7 +95,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/F7C027.dts b/sys/gnu/dts/mips/F7C027.dts
index 8438d12d3a8de..6214c85d03789 100644
--- a/sys/gnu/dts/mips/F7C027.dts
+++ b/sys/gnu/dts/mips/F7C027.dts
@@ -63,7 +63,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l12805d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/FIREWRT.dts b/sys/gnu/dts/mips/FIREWRT.dts
index 3e6806e960364..4299b68a34056 100644
--- a/sys/gnu/dts/mips/FIREWRT.dts
+++ b/sys/gnu/dts/mips/FIREWRT.dts
@@ -55,7 +55,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/GL-MT300A.dts b/sys/gnu/dts/mips/GL-MT300A.dts
index fa3fc4423acc1..5edb7ca4878eb 100644
--- a/sys/gnu/dts/mips/GL-MT300A.dts
+++ b/sys/gnu/dts/mips/GL-MT300A.dts
@@ -83,7 +83,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/GL-MT300N.dts b/sys/gnu/dts/mips/GL-MT300N.dts
index 6a3600acb287f..341a8f6462833 100644
--- a/sys/gnu/dts/mips/GL-MT300N.dts
+++ b/sys/gnu/dts/mips/GL-MT300N.dts
@@ -78,7 +78,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/GL-MT750.dts b/sys/gnu/dts/mips/GL-MT750.dts
index 882e870f06f13..c59ffb37565bc 100644
--- a/sys/gnu/dts/mips/GL-MT750.dts
+++ b/sys/gnu/dts/mips/GL-MT750.dts
@@ -78,7 +78,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/HC5XXX.dtsi b/sys/gnu/dts/mips/HC5XXX.dtsi
index 479dd9eb5ec65..d55d5b65cd6e1 100644
--- a/sys/gnu/dts/mips/HC5XXX.dtsi
+++ b/sys/gnu/dts/mips/HC5XXX.dtsi
@@ -55,7 +55,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
@@ -125,7 +125,7 @@
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uartf", "wled", "nd_sd";
 			ralink,function = "gpio";
diff --git a/sys/gnu/dts/mips/HLKRM04.dts b/sys/gnu/dts/mips/HLKRM04.dts
index fb72b6bd70d76..2f4e43548f58a 100644
--- a/sys/gnu/dts/mips/HLKRM04.dts
+++ b/sys/gnu/dts/mips/HLKRM04.dts
@@ -63,7 +63,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/HT-TM02.dts b/sys/gnu/dts/mips/HT-TM02.dts
index 640ce76d075e0..bfa3536a29d75 100644
--- a/sys/gnu/dts/mips/HT-TM02.dts
+++ b/sys/gnu/dts/mips/HT-TM02.dts
@@ -52,7 +52,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/JHR-N805R.dts b/sys/gnu/dts/mips/JHR-N805R.dts
index bdc4739ebe334..0688c3ab023c3 100644
--- a/sys/gnu/dts/mips/JHR-N805R.dts
+++ b/sys/gnu/dts/mips/JHR-N805R.dts
@@ -45,7 +45,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/LINKIT7688.dts b/sys/gnu/dts/mips/LINKIT7688.dts
index ac8b0352b4fe8..09a8c987f7c34 100644
--- a/sys/gnu/dts/mips/LINKIT7688.dts
+++ b/sys/gnu/dts/mips/LINKIT7688.dts
@@ -115,7 +115,7 @@
 		#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>;
@@ -146,8 +146,8 @@
 	spidev@1 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "spidev";
-		reg = <1 0>;
+		compatible = "linux,spidev";
+		reg = <1>;
 		spi-max-frequency = <40000000>;
 	};
 };
diff --git a/sys/gnu/dts/mips/M2M.dts b/sys/gnu/dts/mips/M2M.dts
index 961ad2d659bb3..22ec534a2a6eb 100644
--- a/sys/gnu/dts/mips/M2M.dts
+++ b/sys/gnu/dts/mips/M2M.dts
@@ -51,7 +51,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/M3.dts b/sys/gnu/dts/mips/M3.dts
index 2b56cf77dce54..9b6ed89142a52 100644
--- a/sys/gnu/dts/mips/M3.dts
+++ b/sys/gnu/dts/mips/M3.dts
@@ -43,7 +43,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q32";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/M4-4M.dts b/sys/gnu/dts/mips/M4-4M.dts
index b6f869da019b6..0502714c3b0e8 100644
--- a/sys/gnu/dts/mips/M4-4M.dts
+++ b/sys/gnu/dts/mips/M4-4M.dts
@@ -36,7 +36,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "pm25lq032";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/M4-8M.dts b/sys/gnu/dts/mips/M4-8M.dts
index 3dff876eeb035..16ee184ed260e 100644
--- a/sys/gnu/dts/mips/M4-8M.dts
+++ b/sys/gnu/dts/mips/M4-8M.dts
@@ -36,7 +36,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "gd25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MINIEMBPLUG.dts b/sys/gnu/dts/mips/MINIEMBPLUG.dts
index 146235efc7e83..eefac574c13e1 100644
--- a/sys/gnu/dts/mips/MINIEMBPLUG.dts
+++ b/sys/gnu/dts/mips/MINIEMBPLUG.dts
@@ -72,7 +72,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MIWIFI-MINI.dts b/sys/gnu/dts/mips/MIWIFI-MINI.dts
index 66c8cb2800e9a..e9ad3750b7097 100644
--- a/sys/gnu/dts/mips/MIWIFI-MINI.dts
+++ b/sys/gnu/dts/mips/MIWIFI-MINI.dts
@@ -62,7 +62,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MIWIFI-NANO.dts b/sys/gnu/dts/mips/MIWIFI-NANO.dts
index 8a46e6dc534b6..57a976ddf00a0 100644
--- a/sys/gnu/dts/mips/MIWIFI-NANO.dts
+++ b/sys/gnu/dts/mips/MIWIFI-NANO.dts
@@ -57,7 +57,7 @@
 		#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>;
diff --git a/sys/gnu/dts/mips/MLW221.dts b/sys/gnu/dts/mips/MLW221.dts
index 7ac130f111f73..670a36aadb367 100644
--- a/sys/gnu/dts/mips/MLW221.dts
+++ b/sys/gnu/dts/mips/MLW221.dts
@@ -59,7 +59,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl129p1";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MLWG2.dts b/sys/gnu/dts/mips/MLWG2.dts
index 29a484f2abc8e..c9f61c735f373 100644
--- a/sys/gnu/dts/mips/MLWG2.dts
+++ b/sys/gnu/dts/mips/MLWG2.dts
@@ -59,7 +59,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MPRA1.dts b/sys/gnu/dts/mips/MPRA1.dts
index 969020cf3d962..d9baed732a219 100644
--- a/sys/gnu/dts/mips/MPRA1.dts
+++ b/sys/gnu/dts/mips/MPRA1.dts
@@ -58,7 +58,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MPRA2.dts b/sys/gnu/dts/mips/MPRA2.dts
index 4d1a53ad77b1b..84f5dda3a63dc 100644
--- a/sys/gnu/dts/mips/MPRA2.dts
+++ b/sys/gnu/dts/mips/MPRA2.dts
@@ -58,7 +58,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
@@ -101,7 +101,8 @@
 };
 
 &esw {
-	mediatek,portmap = <0x2f>;
+	mediatek,portmap = <0x1>;
+	mediatek,portdisable = <0x3e>;
 };
 
 &wmac {
diff --git a/sys/gnu/dts/mips/MT7620a.dts b/sys/gnu/dts/mips/MT7620a.dts
index debe52e7f3967..7bf38976f6162 100644
--- a/sys/gnu/dts/mips/MT7620a.dts
+++ b/sys/gnu/dts/mips/MT7620a.dts
@@ -33,7 +33,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MT7620a_MT7530.dts b/sys/gnu/dts/mips/MT7620a_MT7530.dts
index 5fa87fb1b460e..5885ed045d097 100644
--- a/sys/gnu/dts/mips/MT7620a_MT7530.dts
+++ b/sys/gnu/dts/mips/MT7620a_MT7530.dts
@@ -14,7 +14,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MT7620a_MT7610e.dts b/sys/gnu/dts/mips/MT7620a_MT7610e.dts
index 99e1f80cc2da3..52ceddcbc82ae 100644
--- a/sys/gnu/dts/mips/MT7620a_MT7610e.dts
+++ b/sys/gnu/dts/mips/MT7620a_MT7610e.dts
@@ -37,7 +37,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <1000000>;
 
diff --git a/sys/gnu/dts/mips/MT7628.dts b/sys/gnu/dts/mips/MT7628.dts
index 0f15b4f883c27..a4b066cfd5ad6 100644
--- a/sys/gnu/dts/mips/MT7628.dts
+++ b/sys/gnu/dts/mips/MT7628.dts
@@ -32,7 +32,7 @@
 		#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>;
diff --git a/sys/gnu/dts/mips/MZK-750DHP.dts b/sys/gnu/dts/mips/MZK-750DHP.dts
index 849c02ccf53e4..01fe2a1e24fe5 100644
--- a/sys/gnu/dts/mips/MZK-750DHP.dts
+++ b/sys/gnu/dts/mips/MZK-750DHP.dts
@@ -60,7 +60,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MZK-DP150N.dts b/sys/gnu/dts/mips/MZK-DP150N.dts
index c34ecb1241034..86f82ba59ae41 100644
--- a/sys/gnu/dts/mips/MZK-DP150N.dts
+++ b/sys/gnu/dts/mips/MZK-DP150N.dts
@@ -40,7 +40,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
@@ -67,11 +67,13 @@
 			reg = <0x50000 0x3b0000>;
 		};
 	};
+};
 
-	spidev@1 {
+&spi1 {
+	spidev@0 {
 		compatible = "linux,spidev";
 		spi-max-frequency = <10000000>;
-		reg = <1 0>;
+		reg = <0>;
 	};
 };
 
diff --git a/sys/gnu/dts/mips/MZK-EX300NP.dts b/sys/gnu/dts/mips/MZK-EX300NP.dts
index 07432e231a375..05c79d3faf84f 100644
--- a/sys/gnu/dts/mips/MZK-EX300NP.dts
+++ b/sys/gnu/dts/mips/MZK-EX300NP.dts
@@ -75,7 +75,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MZK-EX750NP.dts b/sys/gnu/dts/mips/MZK-EX750NP.dts
index cecc58a96e3b4..565b4356f0f2a 100644
--- a/sys/gnu/dts/mips/MZK-EX750NP.dts
+++ b/sys/gnu/dts/mips/MZK-EX750NP.dts
@@ -80,7 +80,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/MicroWRT.dts b/sys/gnu/dts/mips/MicroWRT.dts
index 584cd1cb9b36f..07e01550a7f75 100644
--- a/sys/gnu/dts/mips/MicroWRT.dts
+++ b/sys/gnu/dts/mips/MicroWRT.dts
@@ -45,7 +45,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/NCS601W.dts b/sys/gnu/dts/mips/NCS601W.dts
index 57b924402e491..1942b0f9086b1 100644
--- a/sys/gnu/dts/mips/NCS601W.dts
+++ b/sys/gnu/dts/mips/NCS601W.dts
@@ -14,7 +14,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/NW718.dts b/sys/gnu/dts/mips/NW718.dts
index 5480ef30c2e91..06c6b0d62dc9e 100644
--- a/sys/gnu/dts/mips/NW718.dts
+++ b/sys/gnu/dts/mips/NW718.dts
@@ -52,7 +52,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <25000000>;
 
diff --git a/sys/gnu/dts/mips/OY-0001.dts b/sys/gnu/dts/mips/OY-0001.dts
index ffd9ac7ce8d52..6bf1ad6be7096 100644
--- a/sys/gnu/dts/mips/OY-0001.dts
+++ b/sys/gnu/dts/mips/OY-0001.dts
@@ -53,7 +53,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/PBR-M1.dts b/sys/gnu/dts/mips/PBR-M1.dts
index d876e4f1f6f82..708c7c52ddf6e 100644
--- a/sys/gnu/dts/mips/PBR-M1.dts
+++ b/sys/gnu/dts/mips/PBR-M1.dts
@@ -121,7 +121,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/PSG1208.dts b/sys/gnu/dts/mips/PSG1208.dts
index 92a8de89f3b57..dc1adc4c731d9 100644
--- a/sys/gnu/dts/mips/PSG1208.dts
+++ b/sys/gnu/dts/mips/PSG1208.dts
@@ -49,7 +49,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/PX-4885-4M.dts b/sys/gnu/dts/mips/PX-4885-4M.dts
index bd8a5a4c663a3..fb2b14cdc15cc 100644
--- a/sys/gnu/dts/mips/PX-4885-4M.dts
+++ b/sys/gnu/dts/mips/PX-4885-4M.dts
@@ -9,7 +9,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/PX-4885-8M.dts b/sys/gnu/dts/mips/PX-4885-8M.dts
index 6dd13be52b58a..6367a5eb2d1b8 100644
--- a/sys/gnu/dts/mips/PX-4885-8M.dts
+++ b/sys/gnu/dts/mips/PX-4885-8M.dts
@@ -9,7 +9,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/PX-4885.dtsi b/sys/gnu/dts/mips/PX-4885.dtsi
index ba862fc0c008c..b135b5747b556 100644
--- a/sys/gnu/dts/mips/PX-4885.dtsi
+++ b/sys/gnu/dts/mips/PX-4885.dtsi
@@ -33,7 +33,7 @@
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "i2c", "jtag", "uartf";
 			ralink,function = "gpio";
diff --git a/sys/gnu/dts/mips/RE6500.dts b/sys/gnu/dts/mips/RE6500.dts
index e26b76e58e444..39205c41acf40 100644
--- a/sys/gnu/dts/mips/RE6500.dts
+++ b/sys/gnu/dts/mips/RE6500.dts
@@ -56,7 +56,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/RP-N53.dts b/sys/gnu/dts/mips/RP-N53.dts
index 9e56b14330ce4..c661be3a28ce3 100644
--- a/sys/gnu/dts/mips/RP-N53.dts
+++ b/sys/gnu/dts/mips/RP-N53.dts
@@ -103,7 +103,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/RT-G32-B1.dts b/sys/gnu/dts/mips/RT-G32-B1.dts
index 886a9402512af..ab8e3fdad3c12 100644
--- a/sys/gnu/dts/mips/RT-G32-B1.dts
+++ b/sys/gnu/dts/mips/RT-G32-B1.dts
@@ -33,7 +33,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/RT-N14U.dts b/sys/gnu/dts/mips/RT-N14U.dts
index 9126f79efcc9c..05263e165d655 100644
--- a/sys/gnu/dts/mips/RT-N14U.dts
+++ b/sys/gnu/dts/mips/RT-N14U.dts
@@ -70,7 +70,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts b/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts
index aa695983e6065..6c45d7a56e379 100644
--- a/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts
+++ b/sys/gnu/dts/mips/RT5350F-OLINUXINO-EVB.dts
@@ -36,7 +36,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts b/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts
index e5f7650960954..e59b4181217bd 100644
--- a/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts
+++ b/sys/gnu/dts/mips/RT5350F-OLINUXINO.dts
@@ -14,7 +14,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/RUT5XX.dts b/sys/gnu/dts/mips/RUT5XX.dts
index d84126307b58e..85c26d96beede 100644
--- a/sys/gnu/dts/mips/RUT5XX.dts
+++ b/sys/gnu/dts/mips/RUT5XX.dts
@@ -36,7 +36,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "n25q128a13";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/SAP-G3200U3.dts b/sys/gnu/dts/mips/SAP-G3200U3.dts
index 02af05d0c99e7..d6f2f3057668c 100644
--- a/sys/gnu/dts/mips/SAP-G3200U3.dts
+++ b/sys/gnu/dts/mips/SAP-G3200U3.dts
@@ -51,7 +51,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/SK-WB8.dts b/sys/gnu/dts/mips/SK-WB8.dts
index bb1e38225ab42..1fed89e11e40a 100644
--- a/sys/gnu/dts/mips/SK-WB8.dts
+++ b/sys/gnu/dts/mips/SK-WB8.dts
@@ -54,7 +54,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/TINY-AC.dts b/sys/gnu/dts/mips/TINY-AC.dts
index cd62132524ecd..6a2124776786b 100644
--- a/sys/gnu/dts/mips/TINY-AC.dts
+++ b/sys/gnu/dts/mips/TINY-AC.dts
@@ -70,7 +70,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/VOCORE-16M.dts b/sys/gnu/dts/mips/VOCORE-16M.dts
index 11ebac7230853..f51c4f5407e08 100644
--- a/sys/gnu/dts/mips/VOCORE-16M.dts
+++ b/sys/gnu/dts/mips/VOCORE-16M.dts
@@ -9,7 +9,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/VOCORE-8M.dts b/sys/gnu/dts/mips/VOCORE-8M.dts
index ea7185b1ab2cb..1026c865c5590 100644
--- a/sys/gnu/dts/mips/VOCORE-8M.dts
+++ b/sys/gnu/dts/mips/VOCORE-8M.dts
@@ -9,7 +9,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/VOCORE.dtsi b/sys/gnu/dts/mips/VOCORE.dtsi
index 93e601cdafe72..bb8a458831fb3 100644
--- a/sys/gnu/dts/mips/VOCORE.dtsi
+++ b/sys/gnu/dts/mips/VOCORE.dtsi
@@ -156,7 +156,7 @@
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag", "uartf", "led";
 			ralink,function = "gpio";
diff --git a/sys/gnu/dts/mips/WHR-1166D.dts b/sys/gnu/dts/mips/WHR-1166D.dts
index f6a57ac341ba1..0c0f62728c7b4 100644
--- a/sys/gnu/dts/mips/WHR-1166D.dts
+++ b/sys/gnu/dts/mips/WHR-1166D.dts
@@ -90,7 +90,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WHR-300HP2.dts b/sys/gnu/dts/mips/WHR-300HP2.dts
index 88981bb367a9b..acd4ce47e54c0 100644
--- a/sys/gnu/dts/mips/WHR-300HP2.dts
+++ b/sys/gnu/dts/mips/WHR-300HP2.dts
@@ -90,7 +90,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WHR-600D.dts b/sys/gnu/dts/mips/WHR-600D.dts
index 67e9ba93ab49c..7d26f32b973e3 100644
--- a/sys/gnu/dts/mips/WHR-600D.dts
+++ b/sys/gnu/dts/mips/WHR-600D.dts
@@ -90,7 +90,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l6405d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WITI.dts b/sys/gnu/dts/mips/WITI.dts
index 774483e231049..8cb5916c59dae 100644
--- a/sys/gnu/dts/mips/WITI.dts
+++ b/sys/gnu/dts/mips/WITI.dts
@@ -63,7 +63,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WIZARD8800.dts b/sys/gnu/dts/mips/WIZARD8800.dts
index 819e93a7bcc40..bbfa61085d2b6 100644
--- a/sys/gnu/dts/mips/WIZARD8800.dts
+++ b/sys/gnu/dts/mips/WIZARD8800.dts
@@ -22,7 +22,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q32";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WIZFI630A.dts b/sys/gnu/dts/mips/WIZFI630A.dts
index 68af608b5e687..0f7ede54dfdc7 100644
--- a/sys/gnu/dts/mips/WIZFI630A.dts
+++ b/sys/gnu/dts/mips/WIZFI630A.dts
@@ -82,7 +82,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WL-330N.dts b/sys/gnu/dts/mips/WL-330N.dts
index f497b242364fb..d3cd74b2ab3e7 100644
--- a/sys/gnu/dts/mips/WL-330N.dts
+++ b/sys/gnu/dts/mips/WL-330N.dts
@@ -47,7 +47,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WL-330N3G.dts b/sys/gnu/dts/mips/WL-330N3G.dts
index d79a7577a43ea..9290673419d4f 100644
--- a/sys/gnu/dts/mips/WL-330N3G.dts
+++ b/sys/gnu/dts/mips/WL-330N3G.dts
@@ -52,7 +52,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WMR-300.dts b/sys/gnu/dts/mips/WMR-300.dts
index 9f9d5b75926b0..02fbdc598a5a7 100644
--- a/sys/gnu/dts/mips/WMR-300.dts
+++ b/sys/gnu/dts/mips/WMR-300.dts
@@ -56,7 +56,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WNCE2001.dts b/sys/gnu/dts/mips/WNCE2001.dts
index b68f3ba3bfc6a..2dc39ce142af7 100644
--- a/sys/gnu/dts/mips/WNCE2001.dts
+++ b/sys/gnu/dts/mips/WNCE2001.dts
@@ -73,7 +73,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l3205d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WNDR3700V5.dts b/sys/gnu/dts/mips/WNDR3700V5.dts
index 8150754472a6a..9d3d0d53968e4 100644
--- a/sys/gnu/dts/mips/WNDR3700V5.dts
+++ b/sys/gnu/dts/mips/WNDR3700V5.dts
@@ -73,7 +73,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "mx25l12805d";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WRH-300CR.dts b/sys/gnu/dts/mips/WRH-300CR.dts
index d3611937ffe40..aece2e6884796 100644
--- a/sys/gnu/dts/mips/WRH-300CR.dts
+++ b/sys/gnu/dts/mips/WRH-300CR.dts
@@ -64,7 +64,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "mx25l12805d";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WRTNODE.dts b/sys/gnu/dts/mips/WRTNODE.dts
index f782f191fdb3c..04f5836d0a9e8 100644
--- a/sys/gnu/dts/mips/WRTNODE.dts
+++ b/sys/gnu/dts/mips/WRTNODE.dts
@@ -35,7 +35,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WRTNODE2.dtsi b/sys/gnu/dts/mips/WRTNODE2.dtsi
index 73aa5d183b1d7..0242314dfb2f4 100644
--- a/sys/gnu/dts/mips/WRTNODE2.dtsi
+++ b/sys/gnu/dts/mips/WRTNODE2.dtsi
@@ -26,7 +26,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		spi-max-frequency = <10000000>;
 		m25p,chunked-io = <32>;
 
@@ -57,9 +57,8 @@
 	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>;
 	};
 };
diff --git a/sys/gnu/dts/mips/WSR-1166.dts b/sys/gnu/dts/mips/WSR-1166.dts
index 936edb38b2b6c..8f9991f4a7f09 100644
--- a/sys/gnu/dts/mips/WSR-1166.dts
+++ b/sys/gnu/dts/mips/WSR-1166.dts
@@ -118,7 +118,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WSR-600.dts b/sys/gnu/dts/mips/WSR-600.dts
index 56988e4b82854..2d08b9369bed0 100644
--- a/sys/gnu/dts/mips/WSR-600.dts
+++ b/sys/gnu/dts/mips/WSR-600.dts
@@ -118,7 +118,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WT1520-4M.dts b/sys/gnu/dts/mips/WT1520-4M.dts
index b3cff48d81afb..9f3d6a7448497 100644
--- a/sys/gnu/dts/mips/WT1520-4M.dts
+++ b/sys/gnu/dts/mips/WT1520-4M.dts
@@ -9,7 +9,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WT1520-8M.dts b/sys/gnu/dts/mips/WT1520-8M.dts
index 8abd9c7ef5765..48b62bef4f514 100644
--- a/sys/gnu/dts/mips/WT1520-8M.dts
+++ b/sys/gnu/dts/mips/WT1520-8M.dts
@@ -9,7 +9,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "s25fl064k";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WT1520.dtsi b/sys/gnu/dts/mips/WT1520.dtsi
index e7158ad2306c6..8cbf99fde24da 100644
--- a/sys/gnu/dts/mips/WT1520.dtsi
+++ b/sys/gnu/dts/mips/WT1520.dtsi
@@ -21,7 +21,7 @@
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "jtag";
 			ralink,function = "gpio";
diff --git a/sys/gnu/dts/mips/WT3020-4M.dts b/sys/gnu/dts/mips/WT3020-4M.dts
index 324112100af8b..f611cdfce9a73 100644
--- a/sys/gnu/dts/mips/WT3020-4M.dts
+++ b/sys/gnu/dts/mips/WT3020-4M.dts
@@ -44,7 +44,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q32";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/WT3020-8M.dts b/sys/gnu/dts/mips/WT3020-8M.dts
index e7abb8e6eb79c..3c6230726c52e 100644
--- a/sys/gnu/dts/mips/WT3020-8M.dts
+++ b/sys/gnu/dts/mips/WT3020-8M.dts
@@ -44,7 +44,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/X5.dts b/sys/gnu/dts/mips/X5.dts
index 26d3cd7ca3f09..86f5c635f1a62 100644
--- a/sys/gnu/dts/mips/X5.dts
+++ b/sys/gnu/dts/mips/X5.dts
@@ -75,7 +75,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "gd25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/X8.dts b/sys/gnu/dts/mips/X8.dts
index 1c8b37af09a2f..733bbb55d4973 100644
--- a/sys/gnu/dts/mips/X8.dts
+++ b/sys/gnu/dts/mips/X8.dts
@@ -36,7 +36,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "gd25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/Y1.dtsi b/sys/gnu/dts/mips/Y1.dtsi
index 25086b0339022..201f48b626147 100644
--- a/sys/gnu/dts/mips/Y1.dtsi
+++ b/sys/gnu/dts/mips/Y1.dtsi
@@ -38,7 +38,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q128";
 		spi-max-frequency = <10000000>;
 
@@ -93,7 +93,7 @@
 };
 
 &pinctrl {
-	state_default {
+	state_default: pinctrl0 {
 		gpio {
 			ralink,group = "uartf", "wled", "nd_sd";
 			ralink,function = "gpio";
diff --git a/sys/gnu/dts/mips/YOUKU-YK1.dts b/sys/gnu/dts/mips/YOUKU-YK1.dts
index dc9622ff7f3b5..a9c13e50b66e7 100644
--- a/sys/gnu/dts/mips/YOUKU-YK1.dts
+++ b/sys/gnu/dts/mips/YOUKU-YK1.dts
@@ -62,7 +62,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "w25q256";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ZBT-WA05.dts b/sys/gnu/dts/mips/ZBT-WA05.dts
index bdf301f93093f..c2d51c300ac71 100644
--- a/sys/gnu/dts/mips/ZBT-WA05.dts
+++ b/sys/gnu/dts/mips/ZBT-WA05.dts
@@ -62,7 +62,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ZBT-WE826.dts b/sys/gnu/dts/mips/ZBT-WE826.dts
index 1e3af892b34c3..75c99a7fdc54c 100644
--- a/sys/gnu/dts/mips/ZBT-WE826.dts
+++ b/sys/gnu/dts/mips/ZBT-WE826.dts
@@ -58,7 +58,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "w25q128";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ZBT-WG2626.dts b/sys/gnu/dts/mips/ZBT-WG2626.dts
index 239ccd278a74d..31f0ffb37362a 100644
--- a/sys/gnu/dts/mips/ZBT-WG2626.dts
+++ b/sys/gnu/dts/mips/ZBT-WG2626.dts
@@ -61,7 +61,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ZBT-WG3526.dts b/sys/gnu/dts/mips/ZBT-WG3526.dts
index 064eb1c17b8c7..2fc8d90e30204 100644
--- a/sys/gnu/dts/mips/ZBT-WG3526.dts
+++ b/sys/gnu/dts/mips/ZBT-WG3526.dts
@@ -61,7 +61,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ZBT-WR8305RT.dts b/sys/gnu/dts/mips/ZBT-WR8305RT.dts
index 4f226d901effb..694b7cfa962be 100644
--- a/sys/gnu/dts/mips/ZBT-WR8305RT.dts
+++ b/sys/gnu/dts/mips/ZBT-WR8305RT.dts
@@ -54,7 +54,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/ZTE-Q7.dts b/sys/gnu/dts/mips/ZTE-Q7.dts
index e90c21e7796cd..2c4c2e57121fc 100644
--- a/sys/gnu/dts/mips/ZTE-Q7.dts
+++ b/sys/gnu/dts/mips/ZTE-Q7.dts
@@ -49,7 +49,7 @@
 		#address-cells = <1>;
 		#size-cells = <1>;
 		compatible = "jedec,spi-nor";
-		reg = <0 0>;
+		reg = <0>;
 		linux,modalias = "m25p80", "en25q64";
 		spi-max-frequency = <10000000>;
 
diff --git a/sys/gnu/dts/mips/mt7620a.dtsi b/sys/gnu/dts/mips/mt7620a.dtsi
index a801dcb18d566..570eb5aefffc3 100644
--- a/sys/gnu/dts/mips/mt7620a.dtsi
+++ b/sys/gnu/dts/mips/mt7620a.dtsi
@@ -232,7 +232,7 @@
 			reset-names = "spi";
 
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			status = "disabled";
 
diff --git a/sys/gnu/dts/mips/mt7620n.dtsi b/sys/gnu/dts/mips/mt7620n.dtsi
index 1df9544ae7473..f1593acd93b45 100644
--- a/sys/gnu/dts/mips/mt7620n.dtsi
+++ b/sys/gnu/dts/mips/mt7620n.dtsi
@@ -184,7 +184,7 @@
 			reset-names = "spi";
 
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			status = "disabled";
 
diff --git a/sys/gnu/dts/mips/mt7621.dtsi b/sys/gnu/dts/mips/mt7621.dtsi
index 32d3ef429f86f..de8bfc943d7c3 100644
--- a/sys/gnu/dts/mips/mt7621.dtsi
+++ b/sys/gnu/dts/mips/mt7621.dtsi
@@ -139,7 +139,7 @@
 			m25p80@0 {
 				#address-cells = <1>;
 				#size-cells = <1>;
-				reg = <0 0>;
+				reg = <0>;
 				spi-max-frequency = <10000000>;
 				m25p,chunked-io = <32>;
 			};
diff --git a/sys/gnu/dts/mips/rt3352.dtsi b/sys/gnu/dts/mips/rt3352.dtsi
index a818a18d222b8..0f64576b1eaf7 100644
--- a/sys/gnu/dts/mips/rt3352.dtsi
+++ b/sys/gnu/dts/mips/rt3352.dtsi
@@ -165,7 +165,7 @@
 			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";
diff --git a/sys/gnu/dts/mips/rt5350.dtsi b/sys/gnu/dts/mips/rt5350.dtsi
index c844117ac385d..05dce6d3e014e 100644
--- a/sys/gnu/dts/mips/rt5350.dtsi
+++ b/sys/gnu/dts/mips/rt5350.dtsi
@@ -161,7 +161,7 @@
 			reset-names = "spi";
 
 			#address-cells = <1>;
-			#size-cells = <1>;
+			#size-cells = <0>;
 
 			pinctrl-names = "default";
 			pinctrl-0 = <&spi_pins>;