ath79: resolve GPIO address conflicts

The ar71xx GPIO driver only uses 0x24 registers, all following GPIO
registers are using to control pinmux functions, which are not handles
by the GPIO driver but the generic Linux pinctrl driver.

For some SoC conflicting address ranges were defined for these (AR7240 &
AR9330).

Resolve these cases and align the address space of the GPIO controller
between all SoCs, as the used address space of the driver is identical
for all these.

Signed-off-by: David Bauer <mail@david-bauer.net>

diff --git a/target/linux/ath79/dts/ar7100.dtsi b/target/linux/ath79/dts/ar7100.dtsi
index ec6ff30ab69a1b34e48f1db9c1f8d4191cba9ab7..86673cb5da3876955d76cf3fe5bb78526451ad84 100644 (file)
--- a/target/linux/ath79/dts/ar7100.dtsi
+++ b/target/linux/ath79/dts/ar7100.dtsi
@@ -57,7 +57,7 @@
 
                        gpio: gpio@18040000 {
                                compatible = "qca,ar7100-gpio";
-                               reg = <0x18040000 0x30>;
+                               reg = <0x18040000 0x28>;
                                interrupts = <2>;
 
                                ngpios = <16>;

diff --git a/target/linux/ath79/dts/ar724x.dtsi b/target/linux/ath79/dts/ar724x.dtsi
index 25d72a786c504863d9e83336b29f4119e47d7b61..882b0bc51a93e37aa1398e5fbb9f152411786f40 100644 (file)
--- a/target/linux/ath79/dts/ar724x.dtsi
+++ b/target/linux/ath79/dts/ar724x.dtsi
@@ -50,7 +50,7 @@
                        gpio: gpio@18040000 {
                                compatible = "qca,ar7240-gpio",
                                                "qca,ar7100-gpio";
-                               reg = <0x18040000 0x30>;
+                               reg = <0x18040000 0x28>;
                                interrupts = <2>;
 
                                ngpios = <18>;

diff --git a/target/linux/ath79/dts/ar9132.dtsi b/target/linux/ath79/dts/ar9132.dtsi
index 37fc32e6d6927180a1464dafa24ee9efcadb0c4c..44a5870ad7afe3dd67b689b1f66f46dc628c2fab 100644 (file)
--- a/target/linux/ath79/dts/ar9132.dtsi
+++ b/target/linux/ath79/dts/ar9132.dtsi
@@ -77,7 +77,7 @@
                        gpio: gpio@18040000 {
                                compatible = "qca,ar9132-gpio",
                                                "qca,ar7100-gpio";
-                               reg = <0x18040000 0x30>;
+                               reg = <0x18040000 0x28>;
                                interrupts = <2>;
 
                                ngpios = <22>;

diff --git a/target/linux/ath79/dts/ar9330.dtsi b/target/linux/ath79/dts/ar9330.dtsi
index 7607fede4925d88048dac0d06b7e1574c5f189b1..06e1cf4601d16d6a8e39952fbc48d8e38a6010dc 100644 (file)
--- a/target/linux/ath79/dts/ar9330.dtsi
+++ b/target/linux/ath79/dts/ar9330.dtsi
@@ -49,7 +49,7 @@
 
                        gpio: gpio@18040000 {
                                compatible = "qca,ar7100-gpio";
-                               reg = <0x18040000 0x34>;
+                               reg = <0x18040000 0x28>;
                                interrupts = <2>;
 
                                ngpios = <30>;

diff --git a/target/linux/ath79/dts/ar934x.dtsi b/target/linux/ath79/dts/ar934x.dtsi
index 42fbab4b6075ec4884daef3628cf395ec5a0ab26..84dbe65f855f328ee6bdd094770c851c1da2cbb6 100644 (file)
--- a/target/linux/ath79/dts/ar934x.dtsi
+++ b/target/linux/ath79/dts/ar934x.dtsi
@@ -78,7 +78,7 @@
 
                        gpio: gpio@18040000 {
                                compatible = "qca,ar9340-gpio";
-                               reg = <0x18040000 0x2c>;
+                               reg = <0x18040000 0x28>;
 
                                interrupts = <2>;
                                ngpios = <23>;