From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci
Date: Fri, 27 Jan 2017 11:49:32 +0100 [thread overview]
Message-ID: <878tpwydz7.fsf@free-electrons.com> (raw)
In-Reply-To: <E1cS72h-0004nc-Rr@rmk-PC.armlinux.org.uk> (Russell King's message of "Fri, 13 Jan 2017 18:57:39 +0000")
Hi Russell,
On ven., janv. 13 2017, Russell King <rmk+kernel@armlinux•org.uk> wrote:
> 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
>
> Signed-off-by: Russell King <rmk+kernel@armlinux•org.uk>
> ---
> 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(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> index 464b491c7291..65ad781d7910 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
> @@ -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>;
> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> index b10f4781d8fb..168d667d50a3 100644
> --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
> @@ -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>;
> --
> 2.7.4
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
prev parent reply other threads:[~2017-01-27 10:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 18:57 [PATCH] arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci Russell King
2017-01-16 12:06 ` Mark Rutland
2017-01-27 10:49 ` Gregory CLEMENT [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878tpwydz7.fsf@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox