Skip to content

Commit 967ff33

Browse files
committed
Revert "arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts"
The driver part of this support was not merged which leads to break AHCI on all Marvell Armada 7k8k / CN913x platforms as it was reported by Marcin Wojtas. So for now let's remove it in order to fix the issue waiting for the driver part really be merged. This reverts commit 53e950d. Fixes: 53e950d ("arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts") Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
1 parent a38fd87 commit 967ff33

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/arm64/boot/dts/marvell/armada-cp11x.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,22 +310,22 @@
310310
};
311311

312312
CP11X_LABEL(sata0): sata@540000 {
313-
compatible = "marvell,armada-8k-ahci";
313+
compatible = "marvell,armada-8k-ahci",
314+
"generic-ahci";
314315
reg = <0x540000 0x30000>;
315316
dma-coherent;
317+
interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
316318
clocks = <&CP11X_LABEL(clk) 1 15>,
317319
<&CP11X_LABEL(clk) 1 16>;
318320
#address-cells = <1>;
319321
#size-cells = <0>;
320322
status = "disabled";
321323

322324
sata-port@0 {
323-
interrupts = <109 IRQ_TYPE_LEVEL_HIGH>;
324325
reg = <0>;
325326
};
326327

327328
sata-port@1 {
328-
interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
329329
reg = <1>;
330330
};
331331
};

0 commit comments

Comments
 (0)