[PATCH 1/2] Revert "ARM: dts: armada-38x: Fix compatible string for gpios"

[PATCH 1/2] Revert "ARM: dts: armada-38x: Fix compatible string for gpios"

[Klaus Kudielka]

This reverts commit c4de4667f15d04ef5920bacf41e514ec7d1ef03d.

On a Turris Omnia (Armada 385), GPIO interrupts ceased to work, ending
up in the DSA switch being non-functional.

The blamed commit seems to be incorrect in the first place, as the 2nd reg
property was not brought in line with the code. But even fixing that leaves
the GPIO interrupts broken on the Omnia.

Furthermore:
Commit 5f79c651e81e states armadaxp-gpio is broken in a non-trivial way.
Commit 988c8c0cd04d deprecates armadaxp-gpio for this reason.

Link: https://lore.kernel.org/r/f24474e70c1a4e9692bd596ef6d97ceda9511245.camel@gmail.com/
Fixes: c4de4667f15d ("ARM: dts: armada-38x: Fix compatible string for gpios")
Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
---
 arch/arm/boot/dts/armada-38x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/armada-38x.dtsi b/arch/arm/boot/dts/armada-38x.dtsi
index 12933eff41..446861b6b1 100644
--- a/arch/arm/boot/dts/armada-38x.dtsi
+++ b/arch/arm/boot/dts/armada-38x.dtsi
@@ -304,7 +304,7 @@ spdif_pins: spdif-pins {
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armadaxp-gpio",
+				compatible = "marvell,armada-370-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18100 0x40>, <0x181c0 0x08>;
 				reg-names = "gpio", "pwm";
@@ -323,7 +323,7 @@ gpio0: gpio@18100 {
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,armadaxp-gpio",
+				compatible = "marvell,armada-370-gpio",
 					     "marvell,orion-gpio";
 				reg = <0x18140 0x40>, <0x181c8 0x08>;
 				reg-names = "gpio", "pwm";
-- 
2.39.0

[PATCH 2/2] Revert "ARM: dts: armada-39x: Fix compatible string for gpios"

[Klaus Kudielka]

This reverts commit d10886a4e6f85ee18d47a1066a52168461370ded.

Commit 5f79c651e81e states armadaxp-gpio is broken in a non-trivial way.
Commit 988c8c0cd04d deprecates armadaxp-gpio for this reason.

Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com>
---
 arch/arm/boot/dts/armada-39x.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi
index 1e05208d9f..9d1cac49c0 100644
--- a/arch/arm/boot/dts/armada-39x.dtsi
+++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -213,7 +213,7 @@ nand_pins: nand-pins {
 			};
 
 			gpio0: gpio@18100 {
-				compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
+				compatible = "marvell,orion-gpio";
 				reg = <0x18100 0x40>;
 				ngpios = <32>;
 				gpio-controller;
@@ -227,7 +227,7 @@ gpio0: gpio@18100 {
 			};
 
 			gpio1: gpio@18140 {
-				compatible = "marvell,armadaxp-gpio", "marvell,orion-gpio";
+				compatible = "marvell,orion-gpio";
 				reg = <0x18140 0x40>;
 				ngpios = <28>;
 				gpio-controller;
-- 
2.39.0