From: David Bauer <mail@david-bauer.net>
Date: Wed, 30 Jun 2021 21:36:02 +0000 (+0200)
Subject: ath79: resolve GPIO address conflicts
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04942780734da56626d088d824a6117a74757637;p=openwrt%2Fstaging%2Fblogic.git

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 ec6ff30ab69a..86673cb5da38 100644
--- 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 25d72a786c50..882b0bc51a93 100644
--- 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 37fc32e6d692..44a5870ad7af 100644
--- 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 7607fede4925..06e1cf4601d1 100644
--- 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 42fbab4b6075..84dbe65f855f 100644
--- 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>;