Skip to content

Commit 75b58cf

Browse files
kkudielkagclement
authored andcommitted
Revert "ARM: dts: armada-38x: Fix compatible string for gpios"
This reverts commit c4de466, which causes a regression on Turris Omnia (Armada 385): GPIO interrupts cease to work, ending up in the DSA switch being non-functional. The blamed commit is incorrect in the first place: If compatible = "marvell,armadaxp-gpio", the second (address, size) pair of the reg property must to point to the per-CPU interrupt registers <0x18800 0x30> / <0x18840 0x30>, and not to the blink enable registers <0x181c0 0x08> / <0x181c8 0x08>. But even fixing that leaves the GPIO interrupts broken on the Omnia. Furthermore: Commit 5f79c65 explains very well, why the gpio-mvebu driver does not work reliably with per-CPU interrupts. Commit 988c8c0 deprecates compatible = marvell,armadaxp-gpio for this reason. Fixes: c4de466 ("ARM: dts: armada-38x: Fix compatible string for gpios") Reported-by: Klaus Kudielka <klaus.kudielka@gmail.com> Link: https://lore.kernel.org/r/f24474e70c1a4e9692bd596ef6d97ceda9511245.camel@gmail.com/ Signed-off-by: Klaus Kudielka <klaus.kudielka@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent 1b929c0 commit 75b58cf

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@
304304
};
305305

306306
gpio0: gpio@18100 {
307-
compatible = "marvell,armadaxp-gpio",
307+
compatible = "marvell,armada-370-gpio",
308308
"marvell,orion-gpio";
309309
reg = <0x18100 0x40>, <0x181c0 0x08>;
310310
reg-names = "gpio", "pwm";
@@ -323,7 +323,7 @@
323323
};
324324

325325
gpio1: gpio@18140 {
326-
compatible = "marvell,armadaxp-gpio",
326+
compatible = "marvell,armada-370-gpio",
327327
"marvell,orion-gpio";
328328
reg = <0x18140 0x40>, <0x181c8 0x08>;
329329
reg-names = "gpio", "pwm";

0 commit comments

Comments
 (0)