Skip to contentSkip to conversation

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

PATCH New Russell King 3 participants 3 messages Jan 13, 2017 – Jan 27, 2017

Subsystems (2)
Device tree bindings Arm/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SoC support
lore
Share & tools
lore

Russell King

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 ++-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +2 -1
index 464b491c7291..65ad781d7910 100644
@@ -128,7 +128,8 @@
 			};
 
 			cpm_sata0: sata at 540000 {
-				compatible = "marvell,armada-8k-ahci";
+				compatible = "marvell,armada-8k-ahci",
+					     "generic-ahci";
 				reg = <0x540000 0x30000>;
 				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&cpm_syscon0 1 15>;
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +2 -1
index b10f4781d8fb..168d667d50a3 100644
@@ -128,7 +128,8 @@
 			};
 
 			cps_sata0: sata at 540000 {
-				compatible = "marvell,armada-8k-ahci";
+				compatible = "marvell,armada-8k-ahci",
+					     "generic-ahci";
 				reg = <0x540000 0x30000>;
 				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&cps_syscon0 1 15>;
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci

Quoted 9 lines · Russell King

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

Assuming the above is correct this looks sane to me. FWIW:

Acked-by Mark Rutland <[email protected]>

Mark.

Quoted 36 lines
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 ++-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +2 -1
index 464b491c7291..65ad781d7910 100644
@@ -128,7 +128,8 @@
 			};
 
 			cpm_sata0: sata at 540000 {
-				compatible = "marvell,armada-8k-ahci";
+				compatible = "marvell,armada-8k-ahci",
+					     "generic-ahci";
 				reg = <0x540000 0x30000>;
 				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&cpm_syscon0 1 15>;
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +2 -1
index b10f4781d8fb..168d667d50a3 100644
@@ -128,7 +128,8 @@
 			};
 
 			cps_sata0: sata at 540000 {
-				compatible = "marvell,armada-8k-ahci";
+				compatible = "marvell,armada-8k-ahci",
+					     "generic-ahci";
 				reg = <0x540000 0x30000>;
 				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&cps_syscon0 1 15>;
Signature · 1 line
2.7.4
#2 lore raw

PATCH 1/1 arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci

In reply to Russell King

Hi Russell,

Quoted 7 lines · Russell King

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.

Applied on mvebu/dt64

(not that it didn't apply cleanly on the mainline because in mainline we don't use yet the ICU for the interrupt)

Thanks,

Gregory

Quoted 38 lines
Signed-off-by Russell King <[email protected]>
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 ++-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +2 -1
index 464b491c7291..65ad781d7910 100644
@@ -128,7 +128,8 @@
 			};
 
 			cpm_sata0: sata at 540000 {
-				compatible = "marvell,armada-8k-ahci";
+				compatible = "marvell,armada-8k-ahci",
+					     "generic-ahci";
 				reg = <0x540000 0x30000>;
 				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&cpm_syscon0 1 15>;
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +2 -1
index b10f4781d8fb..168d667d50a3 100644
@@ -128,7 +128,8 @@
 			};
 
 			cps_sata0: sata at 540000 {
-				compatible = "marvell,armada-8k-ahci";
+				compatible = "marvell,armada-8k-ahci",
+					     "generic-ahci";
 				reg = <0x540000 0x30000>;
 				interrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&cps_syscon0 1 15>;
Signature · 1 line
2.7.4
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com