diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index 66483116199..5237157458e 100644
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -67,7 +67,7 @@
 				reg = <0x18040000 0x28>;
 				interrupts = <2>;
 
-				ngpios = <16>;
+				ngpios = <12>;
 
 				gpio-controller;
 				#gpio-cells = <2>;
diff --git a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
index 6ec700f179c..41629da7505 100644
--- a/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
+++ b/target/linux/ath79/dts/ar7100_mikrotik_routerboard-4xx.dtsi
@@ -49,12 +49,9 @@
 };
 
 &gpio {
-	ngpios = <31>;
 	gpio-line-names =
 		"",     "", "", "", "LED", "RDY",  "",  "MDC",
-		"MDIO", "", "", "", "",    "",     "",  "",
-		"",     "", "", "", "",    "",     "",  "",
-		"",     "", "", "", "",    "",     "",  "";
+		"MDIO", "", "", "";
 };
 
 &pcie0 {
diff --git a/target/linux/ath79/dts/ar7240.dtsi b/target/linux/ath79/dts/ar7240.dtsi
index afbae33a803..eb4b2e4aa39 100644
--- a/target/linux/ath79/dts/ar7240.dtsi
+++ b/target/linux/ath79/dts/ar7240.dtsi
@@ -15,6 +15,10 @@
 	};
 };
 
+&gpio {
+	ngpios = <18>;
+};
+
 &ahb {
 	usb: usb@1b000000 {
 		compatible = "generic-ohci";
diff --git a/target/linux/ath79/dts/ar7242.dtsi b/target/linux/ath79/dts/ar7242.dtsi
index 96b04426145..aab6c28f7b1 100644
--- a/target/linux/ath79/dts/ar7242.dtsi
+++ b/target/linux/ath79/dts/ar7242.dtsi
@@ -16,7 +16,7 @@
 };
 
 &gpio {
-	ngpios = <20>;
+	ngpios = <18>;
 };
 
 &ahb {
diff --git a/target/linux/ath79/dts/ar724x.dtsi b/target/linux/ath79/dts/ar724x.dtsi
index c758fc244e7..7b4bf3e3f21 100644
--- a/target/linux/ath79/dts/ar724x.dtsi
+++ b/target/linux/ath79/dts/ar724x.dtsi
@@ -60,8 +60,6 @@
 				reg = <0x18040000 0x28>;
 				interrupts = <2>;
 
-				ngpios = <18>;
-
 				gpio-controller;
 				#gpio-cells = <2>;
 
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
index f6ff4f3a107..648c3a9c8e8 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
@@ -91,7 +91,6 @@
 };
 
 &gpio {
-	ngpios = <17>;
 	gpio-line-names =
 		"","reset-zigbee","reset-zwave","reset",
 		"LED-orange","","","","","","",
diff --git a/target/linux/ath79/dts/qca953x.dtsi b/target/linux/ath79/dts/qca953x.dtsi
index cc26db5ba29..0e52a80f6e7 100644
--- a/target/linux/ath79/dts/qca953x.dtsi
+++ b/target/linux/ath79/dts/qca953x.dtsi
@@ -72,7 +72,7 @@
 				reg = <0x18040000 0x28>;
 
 				interrupts = <2>;
-				ngpios = <20>;
+				ngpios = <18>;
 
 				gpio-controller;
 				#gpio-cells = <2>;
diff --git a/target/linux/ath79/dts/qca956x.dtsi b/target/linux/ath79/dts/qca956x.dtsi
index 8b261568f0b..de685d053c7 100644
--- a/target/linux/ath79/dts/qca956x.dtsi
+++ b/target/linux/ath79/dts/qca956x.dtsi
@@ -61,7 +61,7 @@
 				reg = <0x18040000 0x28>;
 
 				interrupts = <2>;
-				ngpios = <24>;
+				ngpios = <23>;
 
 				gpio-controller;
 				#gpio-cells = <2>;