diff options
author | Simon Guinot <simon.guinot@sequanux.org> | 2014-01-14 14:04:39 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 14:08:15 -0500 |
commit | 509e5695265037de4c7aefcf2c9c1db99babab8b (patch) | |
tree | d8ef84ad1d1ee4f96e0727f7130c3a542d527bf0 | |
parent | 2e59688b755c3ad72103b909eeaea388a7cdab0b (diff) |
ata: sata_mv: introduce compatible string "marvell, armada-370-sata"
commit b1f5c73bd5a4752efb7d7af019034044b08aafe9 upstream.
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>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | Documentation/devicetree/bindings/ata/marvell.txt | 2 | ||||
-rw-r--r-- | drivers/ata/sata_mv.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt index b5cdd20cde9c..1c8351604d38 100644 --- a/Documentation/devicetree/bindings/ata/marvell.txt +++ b/Documentation/devicetree/bindings/ata/marvell.txt | |||
@@ -1,7 +1,7 @@ | |||
1 | * Marvell Orion SATA | 1 | * Marvell Orion SATA |
2 | 2 | ||
3 | Required Properties: | 3 | Required Properties: |
4 | - compatibility : "marvell,orion-sata" | 4 | - compatibility : "marvell,orion-sata" or "marvell,armada-370-sata" |
5 | - reg : Address range of controller | 5 | - reg : Address range of controller |
6 | - interrupts : Interrupt controller is using | 6 | - interrupts : Interrupt controller is using |
7 | - nr-ports : Number of SATA ports in use. | 7 | - nr-ports : Number of SATA ports in use. |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 35c6b6d09c27..9258775942b1 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -4216,6 +4216,7 @@ static int mv_platform_resume(struct platform_device *pdev) | |||
4216 | 4216 | ||
4217 | #ifdef CONFIG_OF | 4217 | #ifdef CONFIG_OF |
4218 | static struct of_device_id mv_sata_dt_ids[] = { | 4218 | static struct of_device_id mv_sata_dt_ids[] = { |
4219 | { .compatible = "marvell,armada-370-sata", }, | ||
4219 | { .compatible = "marvell,orion-sata", }, | 4220 | { .compatible = "marvell,orion-sata", }, |
4220 | {}, | 4221 | {}, |
4221 | }; | 4222 | }; |