2023-01-01 09:28:05

by Klaus Kudielka

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

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 <[email protected]>
---
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