| Message ID | 20201109173948.96663-10-sven.auhagen@voleatech.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Armada8k enable per-port SATA interrupts and drop a hack in the IRQ subsystem | expand |
Hi Sven, > From: Sven Auhagen <sven.auhagen@voleatech.de> > > There are two SATA ports per CP110. Each of them has a dedicated > interrupt. Describe the real hardware by adding two SATA ports to the > CP110 SATA node. > > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Applied on mvebu/dt64 Thanks, Gregory > --- > arch/arm64/boot/dts/marvell/armada-cp11x.dtsi | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi > index 9dcf16beabf5..ec27294f097b 100644 > --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi > @@ -300,11 +300,9 @@ > }; > > CP11X_LABEL(sata0): sata@540000 { > - compatible = "marvell,armada-8k-ahci", > - "generic-ahci"; > + compatible = "marvell,armada-8k-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>; > @@ -312,10 +310,12 @@ > status = "disabled"; > > sata-port@0 { > + interrupts = <109 IRQ_TYPE_LEVEL_HIGH>; > reg = <0>; > }; > > sata-port@1 { > + interrupts = <107 IRQ_TYPE_LEVEL_HIGH>; > reg = <1>; > }; > }; > -- > 2.20.1 >
diff --git a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi index 9dcf16beabf5..ec27294f097b 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi @@ -300,11 +300,9 @@ }; CP11X_LABEL(sata0): sata@540000 { - compatible = "marvell,armada-8k-ahci", - "generic-ahci"; + compatible = "marvell,armada-8k-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>; @@ -312,10 +310,12 @@ status = "disabled"; sata-port@0 { + interrupts = <109 IRQ_TYPE_LEVEL_HIGH>; reg = <0>; }; sata-port@1 { + interrupts = <107 IRQ_TYPE_LEVEL_HIGH>; reg = <1>; }; };