summaryrefslogtreecommitdiff
path: root/drivers/ata
diff options
context:
space:
mode:
authorSimon Guinot <simon.guinot@sequanux.org>2014-01-14 20:04:39 +0100
committerTejun Heo <tj@kernel.org>2014-01-15 07:44:02 -0500
commitb1f5c73bd5a4752efb7d7af019034044b08aafe9 (patch)
tree8bdb12c799c2461182877fb47ef38b47ea6d0b81 /drivers/ata
parented68a34a22ac310cbf9ea58f30f4076ca146d251 (diff)
downloadlinux-stable-b1f5c73bd5a4752efb7d7af019034044b08aafe9.tar.gz
linux-stable-b1f5c73bd5a4752efb7d7af019034044b08aafe9.tar.bz2
linux-stable-b1f5c73bd5a4752efb7d7af019034044b08aafe9.zip
ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
The sata_mv driver supports the SATA IP found in several Marvell SoCs. As some new SATA registers have been introduced with the Armada 370/XP SoCs, a way to identify them is needed. This patch introduces a new compatible string for the SATA IP found in Armada 370/XP SoCs. Signed-off-by: Simon Guinot <simon.guinot@sequanux.org> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Gregory Clement <gregory.clement@free-electrons.com> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Cc: Lior Amsalem <alior@marvell.com> Cc: stable@vger.kernel.org # v3.6+ Acked-by: Jason Cooper <jason@lakedaemon.net> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/sata_mv.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 56be31819897..4ec5368c10f7 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -4209,6 +4209,7 @@ static int mv_platform_resume(struct platform_device *pdev)
#ifdef CONFIG_OF
static struct of_device_id mv_sata_dt_ids[] = {
+ { .compatible = "marvell,armada-370-sata", },
{ .compatible = "marvell,orion-sata", },
{},
};