diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index 86673cb5da..12ab7e5039 100644
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -146,6 +146,9 @@
 		has-synopsys-hc-bug;
 
 		status = "disabled";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	usb1: usb@1c000000 {
@@ -159,6 +162,9 @@
 		phys = <&usb_phy>;
 
 		status = "disabled";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 
 	spi: spi@1f000000 {
diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index 730c509d7b..425d75f0d7 100644
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -29,6 +29,9 @@
 		phys = <&usb_phy>;
 
 		status = "disabled";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 };
 
diff --git a/target/linux/ath79/dts/ar7241.dtsi b/target/linux/ath79/dts/ar7241.dtsi
index 4044cdee0e..ff7a61f921 100644
--- a/target/linux/ath79/dts/ar7241.dtsi
+++ b/target/linux/ath79/dts/ar7241.dtsi
@@ -36,6 +36,9 @@
 		phys = <&usb_phy>;
 
 		status = "disabled";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 };
 
diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi
index be28ae7838..eda1b16309 100644
--- a/target/linux/ath79/dts/ar7242.dtsi
+++ b/target/linux/ath79/dts/ar7242.dtsi
@@ -36,6 +36,9 @@
 		phys = <&usb_phy>;
 
 		status = "disabled";
+
+		#address-cells = <1>;
+		#size-cells = <0>;
 	};
 };
 
diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
index f5433a30a3..0c2fe394d4 100644
--- a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
+++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
@@ -114,11 +114,12 @@
 
 	ethernet-switch@1e {
 		compatible = "brcm,bcm53128";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		reg = <0x1e>;
 
 		ports {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
 			port0@0 {
 				reg = <0>;
 				label = "lan1";
diff --git a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
index 3f996a16c7..c776c8ef6e 100644
--- a/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
+++ b/target/linux/ath79/dts/ar7242_ubnt_sw.dtsi
@@ -41,8 +41,8 @@
 
 	gpio_spi {
 		compatible = "spi-gpio";
-		#address-cells = <0x1>;
-		ranges;
+		#address-cells = <1>;
+		#size-cells = <0>;
 
 		sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
 		mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 06e1cf4601..aed8e205ad 100644
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -116,6 +116,9 @@
 			phys = <&usb_phy>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		spi: spi@1f000000 {
diff --git a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
index de8bfb70b7..bbbcc3e0b6 100644
--- a/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
+++ b/target/linux/ath79/dts/ar9344_openmesh_mr600.dtsi
@@ -129,6 +129,9 @@
 		nvmem-cells = <&macaddr_art_0>;
 		nvmem-cell-names = "mac-address";
 		mac-address-increment = <8>;
+
+		gpio-controller;
+		#gpio-cells = <2>;
 	};
 };
 
diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi
index 84dbe65f85..d88c7bfabc 100644
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -175,6 +175,9 @@
 			phys = <&usb_phy>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		nand: nand@1b000200 {
diff --git a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
index d2fbc09c60..9a4db6f9fc 100644
--- a/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
+++ b/target/linux/ath79/dts/qca9531_dlink_dch-g020-a1.dts
@@ -19,7 +19,7 @@
 	i2c {
 		compatible = "i2c-gpio";
 		#address-cells = <1>;
-		#size-cells = <1>;
+		#size-cells = <0>;
 
 		sda-gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
 		scl-gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index d73163c3fe..6df0941eef 100644
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -201,6 +201,9 @@
 			phys = <&usb_phy>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		spi: spi@1f000000 {
diff --git a/target/linux/ath79/dts/qca955x.dtsi b/target/linux/ath79/dts/qca955x.dtsi
index 8138f4afee..fb820169d5 100644
--- a/target/linux/ath79/dts/qca955x.dtsi
+++ b/target/linux/ath79/dts/qca955x.dtsi
@@ -265,6 +265,9 @@
 			phys = <&usb_phy0>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		usb1: usb@1b400000 {
@@ -283,6 +286,9 @@
 			phys = <&usb_phy1>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		nand: nand@1b800200 {
diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index 8627f7ee40..f2452e9dc7 100644
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -200,6 +200,9 @@
 			phys = <&usb_phy0>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		usb1: usb@1b400000 {
@@ -219,6 +222,9 @@
 			phys = <&usb_phy1>;
 
 			status = "disabled";
+
+			#address-cells = <1>;
+			#size-cells = <0>;
 		};
 
 		spi: spi@1f000000 {