ath79: correct dts ngpios properties

SoC Model	GPIO number

ar7100		12
ar7240		18(unknown, default)
ar7241		20
ar7242		18
ar9132		22(unknown, default)
ar9331		30
ar934x		23
qca953x		18
qca955x		24
qca956x		23

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
Link: https://github.com/openwrt/openwrt/pull/15784
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index 66483116199d94135a4c94e8824c100af99a5fab..5237157458ed6b1269b686494ff2eeaa4c5a648c 100644 (file)
--- 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 6ec700f179c1ccae59e056449a9b8a3ba7041d84..41629da75059e65000434edd80f8758e8b4fa541 100644 (file)
--- 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 afbae33a803dade7cd6564c5788fa9cbc1f70773..eb4b2e4aa39367e907f0e4622451f7298caa9513 100644 (file)
--- 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 96b04426145e0b46e486f9192f4f6d2f3cd54072..aab6c28f7b1f39aca79fe68094decd0d67dbcc96 100644 (file)
--- 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 c758fc244e72b9af0919c195093c7fd89fcad670..7b4bf3e3f21ecc0af33e22fda0ba31c56ce3ec62 100644 (file)
--- 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 f6ff4f3a107e9a7b952aa2d7ff3994b65fed17d9..648c3a9c8e8c2d19ccfe761beb371935bf5e7384 100644 (file)
--- 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 cc26db5ba2955a59068163f19a4d1b2ba1c3227c..0e52a80f6e776fe41b87d5db41cbafa13d48695e 100644 (file)
--- 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 8b261568f0b5c2d0435db923f598470d868fe911..de685d053c75bffc902a4498dd638f7274361efd 100644 (file)
--- 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>;