Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Simon Guinot and committed by
Tejun Heo
b1f5c73b ed68a34a

+2 -1
+1 -1
Documentation/devicetree/bindings/ata/marvell.txt
··· 1 1 * Marvell Orion SATA 2 2 3 3 Required Properties: 4 - - compatibility : "marvell,orion-sata" 4 + - compatibility : "marvell,orion-sata" or "marvell,armada-370-sata" 5 5 - reg : Address range of controller 6 6 - interrupts : Interrupt controller is using 7 7 - nr-ports : Number of SATA ports in use.
+1
drivers/ata/sata_mv.c
··· 4209 4209 4210 4210 #ifdef CONFIG_OF 4211 4211 static struct of_device_id mv_sata_dt_ids[] = { 4212 + { .compatible = "marvell,armada-370-sata", }, 4212 4213 { .compatible = "marvell,orion-sata", }, 4213 4214 {}, 4214 4215 };