Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f5c73b authored by Simon Guinot's avatar Simon Guinot Committed by Tejun Heo
Browse files

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: default avatarSimon 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: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent ed68a34a

Documentation/devicetree/bindings/ata/marvell.txt

+1 −1
Original line number Diff line number Diff line 
* Marvell Orion SATA



Required Properties:

- compatibility : "marvell,orion-sata"

- compatibility : "marvell,orion-sata" or "marvell,armada-370-sata"

- reg           : Address range of controller

- interrupts    : Interrupt controller is using

- nr-ports      : Number of SATA ports in use.

drivers/ata/sata_mv.c

+1 −0
Original line number Diff line number Diff line
@@ -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", },

	{},

};