Patch "Revert "arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts"" has been added to the 5.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    Revert "arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts"

to the 5.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-arm64-dts-marvell-armada-cp110-switch-to-per-.patch
and it can be found in the queue-5.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 09f46653d3e9e688dd73ce1c106642e33a36cc88
Author: Gregory CLEMENT <gregory.clement@xxxxxxxxxxx>
Date:   Fri Apr 2 21:58:26 2021 +0200

    Revert "arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts"
    
    [ Upstream commit 967ff33eb0efcd48e4df11ab9aee51c41e0f44d0 ]
    
    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 53e950d597e3578da84238b86424bfcc9e101d87.
    Fixes: 53e950d597e3 ("arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts")
    
    Signed-off-by: Gregory CLEMENT <gregory.clement@xxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
index 994a2fce449a..1e37ae181acf 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi
@@ -300,9 +300,11 @@
 		};
 
 		CP11X_LABEL(sata0): sata@540000 {
-			compatible = "marvell,armada-8k-ahci";
+			compatible = "marvell,armada-8k-ahci",
+			"generic-ahci";
 			reg = <0x540000 0x30000>;
 			dma-coherent;
+			interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&CP11X_LABEL(clk) 1 15>,
 				 <&CP11X_LABEL(clk) 1 16>;
 			#address-cells = <1>;
@@ -310,12 +312,10 @@
 			status = "disabled";
 
 			sata-port@0 {
-				interrupts = <109 IRQ_TYPE_LEVEL_HIGH>;
 				reg = <0>;
 			};
 
 			sata-port@1 {
-				interrupts = <107 IRQ_TYPE_LEVEL_HIGH>;
 				reg = <1>;
 			};
 		};