diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts
index 2d5d8fa7e4..f2a5842c69 100644
--- a/target/linux/brcm63xx/dts/ct-6373.dts
+++ b/target/linux/brcm63xx/dts/ct-6373.dts
@@ -14,7 +14,7 @@
 
 	spi-gpio {
 		#address-cells = <1>;
-		#size-cells = <1>;
+		#size-cells = <0>;
 		compatible = "spi-gpio";
 
 		gpio-mosi = <&gpio0 7 0>;
diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts
index 8d0accdb93..af5136c882 100644
--- a/target/linux/brcm63xx/dts/homehub2a.dts
+++ b/target/linux/brcm63xx/dts/homehub2a.dts
@@ -14,7 +14,7 @@
 
 	spi-gpio {
 		#address-cells = <1>;
-		#size-cells = <1>;
+		#size-cells = <0>;
 		compatible = "spi-gpio";
 
 		gpio-mosi = <&gpio0 7 0>;
diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
index e1f55fde91..2e43dd0d2c 100644
--- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
+++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts
@@ -14,7 +14,7 @@
 
 	spi-gpio {
 		#address-cells = <1>;
-		#size-cells = <1>;
+		#size-cells = <0>;
 		compatible = "spi-gpio";
 
 		gpio-mosi = <&gpio0 7 0>;
diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
index 3044516cf8..1b9e4bc103 100644
--- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts
+++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts
@@ -14,7 +14,7 @@
 
 	spi-gpio {
 		#address-cells = <1>;
-		#size-cells = <1>;
+		#size-cells = <0>;
 		compatible = "spi-gpio";
 
 		gpio-mosi = <&gpio0 7 0>;
diff --git a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
index 0046125529..eeb179999f 100644
--- a/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
+++ b/target/linux/mvebu/files/arch/arm/boot/dts/armada-385-linksys-rango.dts
@@ -408,19 +408,6 @@
 			label = "rango:white:sata";
 		};
 	};
-
-	mvsw61xx {
-		#address-cells = <1>;
-		#size-cells = <0>;
-		compatible = "marvell,88e6352";
-		status = "okay";
-		reg = <0x10>;
-
-		mii-bus = <&mdio>;
-		cpu-port-0 = <5>;
-		cpu-port-1 = <6>;
-	};
-
 };
 
 &pinctrl {
diff --git a/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch b/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
deleted file mode 100644
index 1502b6b142..0000000000
--- a/target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-@@ -467,6 +467,16 @@
- 			};
- 		};
- 	};
-+
-+	mvsw61xx {
-+		compatible = "marvell,88e6172";
-+		status = "okay";
-+		reg = <0x10>;
-+
-+		mii-bus = <&mdio>;
-+		cpu-port-0 = <5>;
-+		cpu-port-1 = <6>;
-+	};
- };
- 
- &pinctrl {
---- a/arch/arm/boot/dts/armada-385-linksys.dtsi
-+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -309,6 +309,18 @@
- 			};
- 		};
- 	};
-+
-+	mvsw61xx {
-+		#address-cells = <1>;
-+		#size-cells = <0>;
-+		compatible = "marvell,88e6176";
-+		status = "okay";
-+		reg = <0x10>;
-+
-+		mii-bus = <&mdio>;
-+		cpu-port-0 = <5>;
-+		cpu-port-1 = <6>;
-+	};
- };
- 
- &pinctrl {
diff --git a/target/linux/ramips/dts/ALL5002.dts b/target/linux/ramips/dts/ALL5002.dts
index 14bbdcdf12..66ed0179a3 100644
--- a/target/linux/ramips/dts/ALL5002.dts
+++ b/target/linux/ramips/dts/ALL5002.dts
@@ -7,6 +7,9 @@
 	model = "Allnet ALL5002";
 
 	i2c-gpio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		compatible = "i2c-gpio";
 		gpios = <&gpio0 1 0 &gpio0 2 0>;
 		i2c-gpio,delay-us = <10>;
diff --git a/target/linux/ramips/dts/ALL5003.dts b/target/linux/ramips/dts/ALL5003.dts
index 432dd516ff..dfb97e6d9b 100644
--- a/target/linux/ramips/dts/ALL5003.dts
+++ b/target/linux/ramips/dts/ALL5003.dts
@@ -7,6 +7,9 @@
 	model = "Allnet ALL5003";
 
 	i2c-gpio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		compatible = "i2c-gpio";
 		gpios = <&gpio0 1 0 &gpio0 2 0>;
 		i2c-gpio,delay-us = <10>;