arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci

Testing with an Armada 8040 board shows that adding the generic-ahci
compatible to the CP110 AHCI nodes gets us working AHCI on the board.
A previous patch series posted by Thomas Petazzoni was retracted when
it was realised that the IP was supposed to be, and is, compatible
with the standard register layout.

Add this compatible.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 05222f749a45e8a75c34d3da1941aed96d438c00..a5fc201a9ddd1dd31e680867ad3f5baad2cfe15a 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -80,7 +80,8 @@
                        };
 
                        cpm_sata0: sata@540000 {
-                               compatible = "marvell,armada-8k-ahci";
+                               compatible = "marvell,armada-8k-ahci",
+                                            "generic-ahci";
                                reg = <0x540000 0x30000>;
                                interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&cpm_syscon0 1 15>;

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 638820ce977dae005474cdfe77f018d226432521..f5240745645169d4f85490db3bb074312e33c1aa 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -80,7 +80,8 @@
                        };
 
                        cps_sata0: sata@540000 {
-                               compatible = "marvell,armada-8k-ahci";
+                               compatible = "marvell,armada-8k-ahci",
+                                            "generic-ahci";
                                reg = <0x540000 0x30000>;
                                interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&cps_syscon0 1 15>;